Changeset 7fc056c3 in github

Timestamp:

May 3, 2011 4:18:40 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

1abb97f

Parents:

4d7fbd5

Message:

• Enable multiselection for attachments uploading in capable browsers (#1485969)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/html.php (modified) (1 diff)
• program/js/app.js (modified) (5 diffs)
• program/steps/mail/compose.inc (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Enable multiselection for attachments uploading in capable browsers (#1485969)
 - Add possibility to change HTML editor configuration by skin
 - Fix a bug where selecting too many contacts would produce too large URI request (#1487892)

program/include/html.php

@@ -272 +272 @@
     protected $allowed = array('type','name','value','size','tabindex',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
-        'spellcheck','results','maxlength','src');
+        'spellcheck','results','maxlength','src','multiple');
 
     /**

program/js/app.js

@@ -474 +474 @@
     // trigger plugin hooks
     this.triggerEvent('actionbefore', {props:props, action:command});
-    var event_ret = this.triggerEvent('before'+command, props);
-    if (event_ret !== undefined) {
+    var ret = this.triggerEvent('before'+command, props);
+    if (ret !== undefined) {
       // abort if one the handlers returned false
-      if (event_ret === false)
+      if (ret === false)
         return false;
       else
-        props = event_ret;
+        props = ret;
     }
 
@@ -3172 +3172 @@
       return false;
 
-    // get file input fields
-    var send = false;
-    for (var n=0; n<form.elements.length; n++)
-      if (form.elements[n].type=='file' && form.elements[n].value) {
-        send = true;
-        break;
-      }
+    // get file input field, count files on capable browser
+    var field = $('input[type=file]', form).get(0),
+      files = field.files ? field.files.length : field.value ? 1 : 0;
 
     // create hidden iframe and post upload form
-    if (send) {
+    if (files) {
       var frame_name = this.async_upload_form(form, 'upload', function(e) {
         var d, content = '';
@@ -3204 +3200 @@
 
       // display upload indicator and cancel button
-      var content = this.get_label('uploading'),
+      var content = this.get_label('uploading' + (files > 1 ? 'many' : '')),
         ts = frame_name.replace(/^rcmupload/, '');
 
@@ -3226 +3222 @@
       return false;
 
-    var li = $('<li>').attr('id', name).html(att.html);
-    var indicator;
+    var indicator, li = $('<li>').attr('id', name).html(att.html);
 
     // replace indicator's li
@@ -3254 +3249 @@
 
     var list = this.gui_objects.attachmentlist.getElementsByTagName("li");
-    for (i=0;i<list.length;i++)
+    for (i=0; i<list.length; i++)
       if (list[i].id == name)
         this.gui_objects.attachmentlist.removeChild(list[i]);

program/steps/mail/compose.inc

@@ -1149 +1149 @@
   if ($max_postsize && $max_postsize < $max_filesize)
     $max_filesize = $max_postsize;
+
+  $OUTPUT->set_env('max_filesize', $max_filesize);
   $max_filesize = show_bytes($max_filesize);
   
@@ -1173 +1175 @@
   $attrib['type'] = 'file';
   $attrib['name'] = '_attachments[]';
+  $attrib['multiple'] = 'multiple';
+
   $field = new html_inputfield($attrib);
   return $field->show();