From 0ed15a2ae68c92e149618587a611957dcd44b0dc Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Tue, 15 Oct 2013 00:35:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=90=9E=E5=AE=9A=EF=BC=8C=E6=94=AF=E6=8C=81=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |   3 +-
 admin/css/style.css          |   8 +-
 admin/file-upload-js.php     |  78 ++++-
 admin/javascript/filedrop.js | 557 +++++++++++++++++++++++++++++++++++
 admin/javascript/typecho.js  | 555 ----------------------------------
 5 files changed, 640 insertions(+), 561 deletions(-)
 create mode 100644 admin/javascript/filedrop.js

diff --git a/.gitignore b/.gitignore
index 0e00d107..cd0f9ed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@
 *.sublime*
 .sass-cache
 config.rb
-/config.inc.php
\ No newline at end of file
+/config.inc.php
+/usr/uploads/
diff --git a/admin/css/style.css b/admin/css/style.css
index dd25a8c1..c25da48e 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -2004,6 +2004,12 @@ ul.typecho-list-notable li .loading {
     color: #999;
     font-size: .92857em;
 }
+
+#upload-panel.drag {
+    border-color: #ccc;
+    background-color: #e3e3e3;
+}
+
 #file-list {
     list-style: none;
     margin: 0;
@@ -2186,4 +2192,4 @@ div.token-input-dropdown ul li em {
 div.token-input-dropdown ul li.token-input-selected-dropdown-item {
     background-color: #467B96;
     color: #FFF;
-}
\ No newline at end of file
+}
diff --git a/admin/file-upload-js.php b/admin/file-upload-js.php
index dd04e647..6b2e40c6 100644
--- a/admin/file-upload-js.php
+++ b/admin/file-upload-js.php
@@ -7,6 +7,7 @@ if (isset($post) && $post instanceof Typecho_Widget && $post->have()) {
 }
 ?>
 
+<script src="<?php $options->adminUrl('javascript/filedrop.js?v=' . $suffixVersion); ?>"></script>
 <script>
 $(document).ready(function() {
     var errorWord = '<?php $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
@@ -21,8 +22,10 @@ $(document).ready(function() {
                 $val *= 1024;
         }
 
-        $val = number_format(ceil($val / 1024));
-        _e('附件上传失败, 请确认附件尺寸没有超过 %s 并且服务器附件目录可以写入', "{$val}Kb"); ?>';
+        $val = number_format(ceil($val / (1024 *1024)));
+        _e('附件上传失败, 请确认附件尺寸没有超过 %s 并且服务器附件目录可以写入', "{$val}Mb"); ?>',
+        loading = $('<img src="<?php $options->adminUrl('images/ajax-loader.gif'); ?>" style="display:none" />')
+            .appendTo(document.body);
 
     function fileUploadStart (file, id) {
         $('<li id="' + id + '" class="loading">'
@@ -79,7 +82,72 @@ $(document).ready(function() {
         }
     }
 ?>],
-        uploadStarted   :   function (i, file, len) {
+
+        maxfilesize     :   <?php 
+        $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
+        $last = strtolower($val[strlen($val)-1]);
+        switch($last) {
+            // The 'G' modifier is available since PHP 5.1.0
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+        }
+
+        echo ceil($val / (1024 * 1024));
+        ?>,
+
+        error: function(err, file) {
+            switch(err) {
+                case 'BrowserNotSupported':
+                    alert('<?php _e('浏览器不支持拖拽上传'); ?>');
+                    break;
+                case 'TooManyFiles':
+                    alert('<?php _e('一次上传的文件不能多于%d个', 25); ?>');
+                    break;
+                case 'FileTooLarge':
+                    alert('<?php $val = function_exists('ini_get') ? trim(ini_get('upload_max_filesize')) : 0;
+        $last = strtolower($val[strlen($val)-1]);
+        switch($last) {
+            // The 'G' modifier is available since PHP 5.1.0
+            case 'g':
+                $val *= 1024;
+            case 'm':
+                $val *= 1024;
+            case 'k':
+                $val *= 1024;
+        }
+
+        $val = number_format(ceil($val / (1024 *1024)));
+        _e('附件尺寸不能超过 %s', "{$val}Mb"); ?>');
+                    break;
+                case 'FileTypeNotAllowed':
+                    // The file type is not in the specified list 'allowedfiletypes'
+                    break;
+                case 'FileExtensionNotAllowed':
+                    alert('<?php _e('附件 %s 的类型不被支持'); ?>'.replace('%s', file.name));
+                    break;
+                default:
+                    break;
+            }
+        },
+        
+        
+        dragOver : function () {
+            $(this).addClass('drag');
+        },
+
+        dragLeave : function () {
+            $(this).removeClass('drag');
+        },
+
+        drop : function () {
+            $(this).removeClass('drag');
+        },
+
+        uploadOpened   :   function (i, file, len) {
             fileUploadStart(file.name, 'drag-' + i);
         },
 
@@ -109,7 +177,9 @@ $(document).ready(function() {
                 $.post('<?php $options->index('/action/contents-attachment-edit'); ?>',
                     {'do' : 'delete', 'cid' : cid},
                     function () {
-                        el.remove();
+                        $(el).fadeOut(function () {
+                            $(this).remove();
+                        });
                     });
             }
 
diff --git a/admin/javascript/filedrop.js b/admin/javascript/filedrop.js
new file mode 100644
index 00000000..4d95fee3
--- /dev/null
+++ b/admin/javascript/filedrop.js
@@ -0,0 +1,557 @@
+/*global jQuery:false, alert:false */
+
+/*
+ * Default text - jQuery plugin for html5 dragging files from desktop to browser
+ *
+ * Author: Weixi Yen
+ *
+ * Email: [Firstname][Lastname]@gmail.com
+ *
+ * Copyright (c) 2010 Resopollution
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://www.github.com/weixiyen/jquery-filedrop
+ *
+ * Version:  0.1.0
+ *
+ * Features:
+ *      Allows sending of extra parameters with file.
+ *      Works with Firefox 3.6+
+ *      Future-compliant with HTML5 spec (will work with Webkit browsers and IE9)
+ * Usage:
+ *  See README at project homepage
+ *
+ */
+;(function($) {
+
+  jQuery.event.props.push("dataTransfer");
+
+  var default_opts = {
+      fallback_id: '',
+      url: '',
+      refresh: 1000,
+      paramname: 'userfile',
+      requestType: 'POST',    // just in case you want to use another HTTP verb
+      allowedfileextensions:[],
+      allowedfiletypes:[],
+      maxfiles: 25,           // Ignored if queuefiles is set > 0
+      maxfilesize: 1,         // MB file size limit
+      queuefiles: 0,          // Max files before queueing (for large volume uploads)
+      queuewait: 200,         // Queue wait time if full
+      data: {},
+      headers: {},
+      drop: empty,
+      dragStart: empty,
+      dragEnter: empty,
+      dragOver: empty,
+      dragLeave: empty,
+      docEnter: empty,
+      docOver: empty,
+      docLeave: empty,
+      beforeEach: empty,
+      afterAll: empty,
+      rename: empty,
+      error: function(err, file, i, status) {
+        alert(err);
+      },
+      uploadOpened: empty,
+      uploadStarted: empty,
+      uploadFinished: empty,
+      progressUpdated: empty,
+      globalProgressUpdated: empty,
+      speedUpdated: empty
+      },
+      errors = ["BrowserNotSupported", "TooManyFiles", "FileTooLarge", "FileTypeNotAllowed", "NotFound", "NotReadable", "AbortError", "ReadError", "FileExtensionNotAllowed"];
+
+  $.fn.filedrop = function(options) {
+    var opts = $.extend({}, default_opts, options),
+        global_progress = [],
+        doc_leave_timer, stop_loop = false,
+        files_count = 0,
+        files;
+
+    $('#' + opts.fallback_id).css({
+      display: 'none',
+      width: 0,
+      height: 0
+    });
+
+    this.on('drop', drop).on('dragstart', opts.dragStart).on('dragenter', dragEnter).on('dragover', dragOver).on('dragleave', dragLeave);
+    $(document).on('drop', docDrop).on('dragenter', docEnter).on('dragover', docOver).on('dragleave', docLeave);
+
+    this.on('click', function(e){
+      $('#' + opts.fallback_id).trigger(e);
+    });
+
+    $('#' + opts.fallback_id).change(function(e) {
+      opts.drop(e);
+      files = e.target.files;
+      files_count = files.length;
+      upload();
+    });
+
+    function drop(e) {
+      if( opts.drop.call(this, e) === false ) return false;
+      if(!e.dataTransfer)
+        return;
+      files = e.dataTransfer.files;
+      if (files === null || files === undefined || files.length === 0) {
+        opts.error(errors[0]);
+        return false;
+      }
+      files_count = files.length;
+      upload();
+      e.preventDefault();
+      return false;
+    }
+
+    function getBuilder(filename, filedata, mime, boundary) {
+      var dashdash = '--',
+          crlf = '\r\n',
+          builder = '',
+          paramname = opts.paramname;
+
+      if (opts.data) {
+        var params = $.param(opts.data).replace(/\+/g, '%20').split(/&/);
+
+        $.each(params, function() {
+          var pair = this.split("=", 2),
+              name = decodeURIComponent(pair[0]),
+              val  = decodeURIComponent(pair[1]);
+
+          if (pair.length !== 2) {
+              return;
+          }
+
+          builder += dashdash;
+          builder += boundary;
+          builder += crlf;
+          builder += 'Content-Disposition: form-data; name="' + name + '"';
+          builder += crlf;
+          builder += crlf;
+          builder += val;
+          builder += crlf;
+        });
+      }
+
+      if (jQuery.isFunction(paramname)){
+        paramname = paramname(filename);
+      }
+
+      builder += dashdash;
+      builder += boundary;
+      builder += crlf;
+      builder += 'Content-Disposition: form-data; name="' + (paramname||"") + '"';
+      builder += '; filename="' + filename + '"';
+      builder += crlf;
+
+      builder += 'Content-Type: ' + mime;
+      builder += crlf;
+      builder += crlf;
+
+      builder += filedata;
+      builder += crlf;
+
+      builder += dashdash;
+      builder += boundary;
+      builder += dashdash;
+      builder += crlf;
+      return builder;
+    }
+
+    function progress(e) {
+      if (e.lengthComputable) {
+        var percentage = Math.round((e.loaded * 100) / e.total);
+        if (this.currentProgress !== percentage) {
+
+          this.currentProgress = percentage;
+          opts.progressUpdated(this.index, this.file, this.currentProgress);
+
+          global_progress[this.global_progress_index] = this.currentProgress;
+          globalProgress();
+
+          var elapsed = new Date().getTime();
+          var diffTime = elapsed - this.currentStart;
+          if (diffTime >= opts.refresh) {
+            var diffData = e.loaded - this.startData;
+            var speed = diffData / diffTime; // KB per second
+            opts.speedUpdated(this.index, this.file, speed);
+            this.startData = e.loaded;
+            this.currentStart = elapsed;
+          }
+        }
+      }
+    }
+
+    function globalProgress() {
+      if (global_progress.length === 0) {
+        return;
+      }
+
+      var total = 0, index;
+      for (index in global_progress) {
+        if(global_progress.hasOwnProperty(index)) {
+          total = total + global_progress[index];
+        }
+      }
+
+      opts.globalProgressUpdated(Math.round(total / global_progress.length));
+    }
+
+    // Respond to an upload
+    function upload() {
+      stop_loop = false;
+
+      if (!files) {
+        opts.error(errors[0]);
+        return false;
+      }
+
+      if (opts.allowedfiletypes.push && opts.allowedfiletypes.length) {
+        for(var fileIndex = files.length;fileIndex--;) {
+          if(!files[fileIndex].type || $.inArray(files[fileIndex].type, opts.allowedfiletypes) < 0) {
+            opts.error(errors[3], files[fileIndex]);
+            return false;
+          }
+        }
+      }
+
+      if (opts.allowedfileextensions.push && opts.allowedfileextensions.length) {
+        for(var fileIndex = files.length;fileIndex--;) {
+          var allowedextension = false;
+          for (i=0;i<opts.allowedfileextensions.length;i++){
+            if (files[fileIndex].name.substr(files[fileIndex].name.length-opts.allowedfileextensions[i].length) == opts.allowedfileextensions[i]) {
+              allowedextension = true;
+            }
+          }
+          if (!allowedextension){
+            opts.error(errors[8], files[fileIndex]);
+            return false;
+          }
+        }
+      }
+
+      var filesDone = 0,
+          filesRejected = 0;
+
+      if (files_count > opts.maxfiles && opts.queuefiles === 0) {
+        opts.error(errors[1]);
+        return false;
+      }
+
+      // Define queues to manage upload process
+      var workQueue = [];
+      var processingQueue = [];
+      var doneQueue = [];
+
+      // Add everything to the workQueue
+      for (var i = 0; i < files_count; i++) {
+        workQueue.push(i);
+        opts.uploadOpened(i, files[i]);
+      }
+
+      // Helper function to enable pause of processing to wait
+      // for in process queue to complete
+      var pause = function(timeout) {
+        setTimeout(process, timeout);
+        return;
+      };
+
+      // Process an upload, recursive
+      var process = function() {
+
+        var fileIndex;
+
+        if (stop_loop) {
+          return false;
+        }
+
+        // Check to see if are in queue mode
+        if (opts.queuefiles > 0 && processingQueue.length >= opts.queuefiles) {
+          return pause(opts.queuewait);
+        } else {
+          // Take first thing off work queue
+          fileIndex = workQueue[0];
+          workQueue.splice(0, 1);
+
+          // Add to processing queue
+          processingQueue.push(fileIndex);
+        }
+
+        try {
+          if (beforeEach(files[fileIndex]) !== false) {
+            if (fileIndex === files_count) {
+              return;
+            }
+            var reader = new FileReader(),
+                max_file_size = 1048576 * opts.maxfilesize;
+
+            reader.index = fileIndex;
+            if (files[fileIndex].size > max_file_size) {
+              opts.error(errors[2], files[fileIndex], fileIndex);
+              // Remove from queue
+              processingQueue.forEach(function(value, key) {
+                if (value === fileIndex) {
+                  processingQueue.splice(key, 1);
+                }
+              });
+              filesRejected++;
+              return true;
+            }
+
+            reader.onerror = function(e) {
+                switch(e.target.error.code) {
+                    case e.target.error.NOT_FOUND_ERR:
+                        opts.error(errors[4]);
+                        return false;
+                    case e.target.error.NOT_READABLE_ERR:
+                        opts.error(errors[5]);
+                        return false;
+                    case e.target.error.ABORT_ERR:
+                        opts.error(errors[6]);
+                        return false;
+                    default:
+                        opts.error(errors[7]);
+                        return false;
+                };
+            };
+
+            reader.onloadend = !opts.beforeSend ? send : function (e) {
+              opts.beforeSend(files[fileIndex], fileIndex, function () { send(e); });
+            };
+
+            reader.readAsDataURL(files[fileIndex]);
+
+          } else {
+            filesRejected++;
+          }
+        } catch (err) {
+          // Remove from queue
+          processingQueue.forEach(function(value, key) {
+            if (value === fileIndex) {
+              processingQueue.splice(key, 1);
+            }
+          });
+          opts.error(errors[0]);
+          return false;
+        }
+
+        // If we still have work to do,
+        if (workQueue.length > 0) {
+          process();
+        }
+      };
+
+      var send = function(e) {
+
+        var fileIndex = (e.srcElement || e.target).index;
+
+        // Sometimes the index is not attached to the
+        // event object. Find it by size. Hack for sure.
+        if (e.target.index === undefined) {
+          e.target.index = getIndexBySize(e.total);
+        }
+
+        var xhr = new XMLHttpRequest(),
+            upload = xhr.upload,
+            file = files[e.target.index],
+            index = e.target.index,
+            start_time = new Date().getTime(),
+            boundary = '------multipartformboundary' + (new Date()).getTime(),
+            global_progress_index = global_progress.length,
+            builder,
+            newName = rename(file.name),
+            mime = file.type;
+
+        if (opts.withCredentials) {
+          xhr.withCredentials = opts.withCredentials;
+        }
+
+        var data = atob(e.target.result.split(',')[1]);
+        if (typeof newName === "string") {
+          builder = getBuilder(newName, data, mime, boundary);
+        } else {
+          builder = getBuilder(file.name, data, mime, boundary);
+        }
+
+        upload.index = index;
+        upload.file = file;
+        upload.downloadStartTime = start_time;
+        upload.currentStart = start_time;
+        upload.currentProgress = 0;
+        upload.global_progress_index = global_progress_index;
+        upload.startData = 0;
+        upload.addEventListener("progress", progress, false);
+
+        // Allow url to be a method
+        if (jQuery.isFunction(opts.url)) {
+            xhr.open(opts.requestType, opts.url(), true);
+        } else {
+            xhr.open(opts.requestType, opts.url, true);
+        }
+
+        xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' + boundary);
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+        // Add headers
+        $.each(opts.headers, function(k, v) {
+          xhr.setRequestHeader(k, v);
+        });
+
+        xhr.sendAsBinary(builder);
+
+        global_progress[global_progress_index] = 0;
+        globalProgress();
+
+        opts.uploadStarted(index, file, files_count);
+
+        xhr.onload = function() {
+            var serverResponse = null;
+
+            if (xhr.responseText) {
+              try {
+                serverResponse = jQuery.parseJSON(xhr.responseText);
+              }
+              catch (e) {
+                serverResponse = xhr.responseText;
+              }
+            }
+
+            var now = new Date().getTime(),
+                timeDiff = now - start_time,
+                result = opts.uploadFinished(index, file, serverResponse, timeDiff, xhr);
+            filesDone++;
+
+            // Remove from processing queue
+            processingQueue.forEach(function(value, key) {
+              if (value === fileIndex) {
+                processingQueue.splice(key, 1);
+              }
+            });
+
+            // Add to donequeue
+            doneQueue.push(fileIndex);
+
+            // Make sure the global progress is updated
+            global_progress[global_progress_index] = 100;
+            globalProgress();
+
+            if (filesDone === (files_count - filesRejected)) {
+              afterAll();
+            }
+            if (result === false) {
+              stop_loop = true;
+            }
+
+
+          // Pass any errors to the error option
+          if (xhr.status < 200 || xhr.status > 299) {
+            opts.error(xhr.statusText, file, fileIndex, xhr.status);
+          }
+        };
+      };
+
+      // Initiate the processing loop
+      process();
+    }
+
+    function getIndexBySize(size) {
+      for (var i = 0; i < files_count; i++) {
+        if (files[i].size === size) {
+          return i;
+        }
+      }
+
+      return undefined;
+    }
+
+    function rename(name) {
+      return opts.rename(name);
+    }
+
+    function beforeEach(file) {
+      return opts.beforeEach(file);
+    }
+
+    function afterAll() {
+      return opts.afterAll();
+    }
+
+    function dragEnter(e) {
+      clearTimeout(doc_leave_timer);
+      e.preventDefault();
+      opts.dragEnter.call(this, e);
+    }
+
+    function dragOver(e) {
+      clearTimeout(doc_leave_timer);
+      e.preventDefault();
+      opts.docOver.call(this, e);
+      opts.dragOver.call(this, e);
+    }
+
+    function dragLeave(e) {
+      clearTimeout(doc_leave_timer);
+      opts.dragLeave.call(this, e);
+      e.stopPropagation();
+    }
+
+    function docDrop(e) {
+      e.preventDefault();
+      opts.docLeave.call(this, e);
+      return false;
+    }
+
+    function docEnter(e) {
+      clearTimeout(doc_leave_timer);
+      e.preventDefault();
+      opts.docEnter.call(this, e);
+      return false;
+    }
+
+    function docOver(e) {
+      clearTimeout(doc_leave_timer);
+      e.preventDefault();
+      opts.docOver.call(this, e);
+      return false;
+    }
+
+    function docLeave(e) {
+      doc_leave_timer = setTimeout((function(_this) {
+        return function() {
+          opts.docLeave.call(_this, e);
+        };
+      })(this), 200);
+    }
+
+    return this;
+  };
+
+  function empty() {}
+
+  try {
+    if (XMLHttpRequest.prototype.sendAsBinary) {
+        return;
+    }
+    XMLHttpRequest.prototype.sendAsBinary = function(datastr) {
+      function byteValue(x) {
+        return x.charCodeAt(0) & 0xff;
+      }
+      var ords = Array.prototype.map.call(datastr, byteValue);
+      var ui8a = new Uint8Array(ords);
+
+      // Not pretty: Chrome 22 deprecated sending ArrayBuffer, moving instead
+      // to sending ArrayBufferView.  Sadly, no proper way to detect this
+      // functionality has been discovered.  Happily, Chrome 22 also introduced
+      // the base ArrayBufferView class, not present in Chrome 21.
+      if ('ArrayBufferView' in window)
+        this.send(ui8a);
+      else
+        this.send(ui8a.buffer);
+    };
+  } catch (e) {}
+
+})(jQuery);
diff --git a/admin/javascript/typecho.js b/admin/javascript/typecho.js
index 4b0ad45c..29b994c1 100644
--- a/admin/javascript/typecho.js
+++ b/admin/javascript/typecho.js
@@ -546,558 +546,3 @@ jQuery.fn.extend(
 );
 })($);
 
-/*global jQuery:false, alert:false */
-
-/*
- * Default text - jQuery plugin for html5 dragging files from desktop to browser
- *
- * Author: Weixi Yen
- *
- * Email: [Firstname][Lastname]@gmail.com
- *
- * Copyright (c) 2010 Resopollution
- *
- * Licensed under the MIT license:
- *   http://www.opensource.org/licenses/mit-license.php
- *
- * Project home:
- *   http://www.github.com/weixiyen/jquery-filedrop
- *
- * Version:  0.1.0
- *
- * Features:
- *      Allows sending of extra parameters with file.
- *      Works with Firefox 3.6+
- *      Future-compliant with HTML5 spec (will work with Webkit browsers and IE9)
- * Usage:
- *  See README at project homepage
- *
- */
-;(function($) {
-
-  jQuery.event.props.push("dataTransfer");
-
-  var default_opts = {
-      fallback_id: '',
-      url: '',
-      refresh: 1000,
-      paramname: 'userfile',
-      requestType: 'POST',    // just in case you want to use another HTTP verb
-      allowedfileextensions:[],
-      allowedfiletypes:[],
-      maxfiles: 25,           // Ignored if queuefiles is set > 0
-      maxfilesize: 1,         // MB file size limit
-      queuefiles: 0,          // Max files before queueing (for large volume uploads)
-      queuewait: 200,         // Queue wait time if full
-      data: {},
-      headers: {},
-      drop: empty,
-      dragStart: empty,
-      dragEnter: empty,
-      dragOver: empty,
-      dragLeave: empty,
-      docEnter: empty,
-      docOver: empty,
-      docLeave: empty,
-      beforeEach: empty,
-      afterAll: empty,
-      rename: empty,
-      error: function(err, file, i, status) {
-        alert(err);
-      },
-      uploadStarted: empty,
-      uploadFinished: empty,
-      progressUpdated: empty,
-      globalProgressUpdated: empty,
-      speedUpdated: empty
-      },
-      errors = ["BrowserNotSupported", "TooManyFiles", "FileTooLarge", "FileTypeNotAllowed", "NotFound", "NotReadable", "AbortError", "ReadError", "FileExtensionNotAllowed"];
-
-  $.fn.filedrop = function(options) {
-    var opts = $.extend({}, default_opts, options),
-        global_progress = [],
-        doc_leave_timer, stop_loop = false,
-        files_count = 0,
-        files;
-
-    $('#' + opts.fallback_id).css({
-      display: 'none',
-      width: 0,
-      height: 0
-    });
-
-    this.on('drop', drop).on('dragstart', opts.dragStart).on('dragenter', dragEnter).on('dragover', dragOver).on('dragleave', dragLeave);
-    $(document).on('drop', docDrop).on('dragenter', docEnter).on('dragover', docOver).on('dragleave', docLeave);
-
-    this.on('click', function(e){
-      $('#' + opts.fallback_id).trigger(e);
-    });
-
-    $('#' + opts.fallback_id).change(function(e) {
-      opts.drop(e);
-      files = e.target.files;
-      files_count = files.length;
-      upload();
-    });
-
-    function drop(e) {
-      if( opts.drop.call(this, e) === false ) return false;
-      if(!e.dataTransfer)
-        return;
-      files = e.dataTransfer.files;
-      if (files === null || files === undefined || files.length === 0) {
-        opts.error(errors[0]);
-        return false;
-      }
-      files_count = files.length;
-      upload();
-      e.preventDefault();
-      return false;
-    }
-
-    function getBuilder(filename, filedata, mime, boundary) {
-      var dashdash = '--',
-          crlf = '\r\n',
-          builder = '',
-          paramname = opts.paramname;
-
-      if (opts.data) {
-        var params = $.param(opts.data).replace(/\+/g, '%20').split(/&/);
-
-        $.each(params, function() {
-          var pair = this.split("=", 2),
-              name = decodeURIComponent(pair[0]),
-              val  = decodeURIComponent(pair[1]);
-
-          if (pair.length !== 2) {
-              return;
-          }
-
-          builder += dashdash;
-          builder += boundary;
-          builder += crlf;
-          builder += 'Content-Disposition: form-data; name="' + name + '"';
-          builder += crlf;
-          builder += crlf;
-          builder += val;
-          builder += crlf;
-        });
-      }
-
-      if (jQuery.isFunction(paramname)){
-        paramname = paramname(filename);
-      }
-
-      builder += dashdash;
-      builder += boundary;
-      builder += crlf;
-      builder += 'Content-Disposition: form-data; name="' + (paramname||"") + '"';
-      builder += '; filename="' + filename + '"';
-      builder += crlf;
-
-      builder += 'Content-Type: ' + mime;
-      builder += crlf;
-      builder += crlf;
-
-      builder += filedata;
-      builder += crlf;
-
-      builder += dashdash;
-      builder += boundary;
-      builder += dashdash;
-      builder += crlf;
-      return builder;
-    }
-
-    function progress(e) {
-      if (e.lengthComputable) {
-        var percentage = Math.round((e.loaded * 100) / e.total);
-        if (this.currentProgress !== percentage) {
-
-          this.currentProgress = percentage;
-          opts.progressUpdated(this.index, this.file, this.currentProgress);
-
-          global_progress[this.global_progress_index] = this.currentProgress;
-          globalProgress();
-
-          var elapsed = new Date().getTime();
-          var diffTime = elapsed - this.currentStart;
-          if (diffTime >= opts.refresh) {
-            var diffData = e.loaded - this.startData;
-            var speed = diffData / diffTime; // KB per second
-            opts.speedUpdated(this.index, this.file, speed);
-            this.startData = e.loaded;
-            this.currentStart = elapsed;
-          }
-        }
-      }
-    }
-
-    function globalProgress() {
-      if (global_progress.length === 0) {
-        return;
-      }
-
-      var total = 0, index;
-      for (index in global_progress) {
-        if(global_progress.hasOwnProperty(index)) {
-          total = total + global_progress[index];
-        }
-      }
-
-      opts.globalProgressUpdated(Math.round(total / global_progress.length));
-    }
-
-    // Respond to an upload
-    function upload() {
-      stop_loop = false;
-
-      if (!files) {
-        opts.error(errors[0]);
-        return false;
-      }
-
-      if (opts.allowedfiletypes.push && opts.allowedfiletypes.length) {
-        for(var fileIndex = files.length;fileIndex--;) {
-          if(!files[fileIndex].type || $.inArray(files[fileIndex].type, opts.allowedfiletypes) < 0) {
-            opts.error(errors[3], files[fileIndex]);
-            return false;
-          }
-        }
-      }
-
-      if (opts.allowedfileextensions.push && opts.allowedfileextensions.length) {
-        for(var fileIndex = files.length;fileIndex--;) {
-          var allowedextension = false;
-          for (i=0;i<opts.allowedfileextensions.length;i++){
-            if (files[fileIndex].name.substr(files[fileIndex].name.length-opts.allowedfileextensions[i].length) == opts.allowedfileextensions[i]) {
-              allowedextension = true;
-            }
-          }
-          if (!allowedextension){
-            opts.error(errors[8], files[fileIndex]);
-            return false;
-          }
-        }
-      }
-
-      var filesDone = 0,
-          filesRejected = 0;
-
-      if (files_count > opts.maxfiles && opts.queuefiles === 0) {
-        opts.error(errors[1]);
-        return false;
-      }
-
-      // Define queues to manage upload process
-      var workQueue = [];
-      var processingQueue = [];
-      var doneQueue = [];
-
-      // Add everything to the workQueue
-      for (var i = 0; i < files_count; i++) {
-        workQueue.push(i);
-      }
-
-      // Helper function to enable pause of processing to wait
-      // for in process queue to complete
-      var pause = function(timeout) {
-        setTimeout(process, timeout);
-        return;
-      };
-
-      // Process an upload, recursive
-      var process = function() {
-
-        var fileIndex;
-
-        if (stop_loop) {
-          return false;
-        }
-
-        // Check to see if are in queue mode
-        if (opts.queuefiles > 0 && processingQueue.length >= opts.queuefiles) {
-          return pause(opts.queuewait);
-        } else {
-          // Take first thing off work queue
-          fileIndex = workQueue[0];
-          workQueue.splice(0, 1);
-
-          // Add to processing queue
-          processingQueue.push(fileIndex);
-        }
-
-        try {
-          if (beforeEach(files[fileIndex]) !== false) {
-            if (fileIndex === files_count) {
-              return;
-            }
-            var reader = new FileReader(),
-                max_file_size = 1048576 * opts.maxfilesize;
-
-            reader.index = fileIndex;
-            if (files[fileIndex].size > max_file_size) {
-              opts.error(errors[2], files[fileIndex], fileIndex);
-              // Remove from queue
-              processingQueue.forEach(function(value, key) {
-                if (value === fileIndex) {
-                  processingQueue.splice(key, 1);
-                }
-              });
-              filesRejected++;
-              return true;
-            }
-
-            reader.onerror = function(e) {
-                switch(e.target.error.code) {
-                    case e.target.error.NOT_FOUND_ERR:
-                        opts.error(errors[4]);
-                        return false;
-                    case e.target.error.NOT_READABLE_ERR:
-                        opts.error(errors[5]);
-                        return false;
-                    case e.target.error.ABORT_ERR:
-                        opts.error(errors[6]);
-                        return false;
-                    default:
-                        opts.error(errors[7]);
-                        return false;
-                };
-            };
-
-            reader.onloadend = !opts.beforeSend ? send : function (e) {
-              opts.beforeSend(files[fileIndex], fileIndex, function () { send(e); });
-            };
-
-            reader.readAsDataURL(files[fileIndex]);
-
-          } else {
-            filesRejected++;
-          }
-        } catch (err) {
-          // Remove from queue
-          processingQueue.forEach(function(value, key) {
-            if (value === fileIndex) {
-              processingQueue.splice(key, 1);
-            }
-          });
-          opts.error(errors[0]);
-          return false;
-        }
-
-        // If we still have work to do,
-        if (workQueue.length > 0) {
-          process();
-        }
-      };
-
-      var send = function(e) {
-
-        var fileIndex = (e.srcElement || e.target).index;
-
-        // Sometimes the index is not attached to the
-        // event object. Find it by size. Hack for sure.
-        if (e.target.index === undefined) {
-          e.target.index = getIndexBySize(e.total);
-        }
-
-        var xhr = new XMLHttpRequest(),
-            upload = xhr.upload,
-            file = files[e.target.index],
-            index = e.target.index,
-            start_time = new Date().getTime(),
-            boundary = '------multipartformboundary' + (new Date()).getTime(),
-            global_progress_index = global_progress.length,
-            builder,
-            newName = rename(file.name),
-            mime = file.type;
-
-        if (opts.withCredentials) {
-          xhr.withCredentials = opts.withCredentials;
-        }
-
-        var data = atob(e.target.result.split(',')[1]);
-        if (typeof newName === "string") {
-          builder = getBuilder(newName, data, mime, boundary);
-        } else {
-          builder = getBuilder(file.name, data, mime, boundary);
-        }
-
-        upload.index = index;
-        upload.file = file;
-        upload.downloadStartTime = start_time;
-        upload.currentStart = start_time;
-        upload.currentProgress = 0;
-        upload.global_progress_index = global_progress_index;
-        upload.startData = 0;
-        upload.addEventListener("progress", progress, false);
-
-        // Allow url to be a method
-        if (jQuery.isFunction(opts.url)) {
-            xhr.open(opts.requestType, opts.url(), true);
-        } else {
-            xhr.open(opts.requestType, opts.url, true);
-        }
-
-        xhr.setRequestHeader('content-type', 'multipart/form-data; boundary=' + boundary);
-        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-
-        // Add headers
-        $.each(opts.headers, function(k, v) {
-          xhr.setRequestHeader(k, v);
-        });
-
-        xhr.sendAsBinary(builder);
-
-        global_progress[global_progress_index] = 0;
-        globalProgress();
-
-        opts.uploadStarted(index, file, files_count);
-
-        xhr.onload = function() {
-            var serverResponse = null;
-
-            if (xhr.responseText) {
-              try {
-                serverResponse = jQuery.parseJSON(xhr.responseText);
-              }
-              catch (e) {
-                serverResponse = xhr.responseText;
-              }
-            }
-
-            var now = new Date().getTime(),
-                timeDiff = now - start_time,
-                result = opts.uploadFinished(index, file, serverResponse, timeDiff, xhr);
-            filesDone++;
-
-            // Remove from processing queue
-            processingQueue.forEach(function(value, key) {
-              if (value === fileIndex) {
-                processingQueue.splice(key, 1);
-              }
-            });
-
-            // Add to donequeue
-            doneQueue.push(fileIndex);
-
-            // Make sure the global progress is updated
-            global_progress[global_progress_index] = 100;
-            globalProgress();
-
-            if (filesDone === (files_count - filesRejected)) {
-              afterAll();
-            }
-            if (result === false) {
-              stop_loop = true;
-            }
-
-
-          // Pass any errors to the error option
-          if (xhr.status < 200 || xhr.status > 299) {
-            opts.error(xhr.statusText, file, fileIndex, xhr.status);
-          }
-        };
-      };
-
-      // Initiate the processing loop
-      process();
-    }
-
-    function getIndexBySize(size) {
-      for (var i = 0; i < files_count; i++) {
-        if (files[i].size === size) {
-          return i;
-        }
-      }
-
-      return undefined;
-    }
-
-    function rename(name) {
-      return opts.rename(name);
-    }
-
-    function beforeEach(file) {
-      return opts.beforeEach(file);
-    }
-
-    function afterAll() {
-      return opts.afterAll();
-    }
-
-    function dragEnter(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.dragEnter.call(this, e);
-    }
-
-    function dragOver(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docOver.call(this, e);
-      opts.dragOver.call(this, e);
-    }
-
-    function dragLeave(e) {
-      clearTimeout(doc_leave_timer);
-      opts.dragLeave.call(this, e);
-      e.stopPropagation();
-    }
-
-    function docDrop(e) {
-      e.preventDefault();
-      opts.docLeave.call(this, e);
-      return false;
-    }
-
-    function docEnter(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docEnter.call(this, e);
-      return false;
-    }
-
-    function docOver(e) {
-      clearTimeout(doc_leave_timer);
-      e.preventDefault();
-      opts.docOver.call(this, e);
-      return false;
-    }
-
-    function docLeave(e) {
-      doc_leave_timer = setTimeout((function(_this) {
-        return function() {
-          opts.docLeave.call(_this, e);
-        };
-      })(this), 200);
-    }
-
-    return this;
-  };
-
-  function empty() {}
-
-  try {
-    if (XMLHttpRequest.prototype.sendAsBinary) {
-        return;
-    }
-    XMLHttpRequest.prototype.sendAsBinary = function(datastr) {
-      function byteValue(x) {
-        return x.charCodeAt(0) & 0xff;
-      }
-      var ords = Array.prototype.map.call(datastr, byteValue);
-      var ui8a = new Uint8Array(ords);
-
-      // Not pretty: Chrome 22 deprecated sending ArrayBuffer, moving instead
-      // to sending ArrayBufferView.  Sadly, no proper way to detect this
-      // functionality has been discovered.  Happily, Chrome 22 also introduced
-      // the base ArrayBufferView class, not present in Chrome 21.
-      if ('ArrayBufferView' in window)
-        this.send(ui8a);
-      else
-        this.send(ui8a.buffer);
-    };
-  } catch (e) {}
-
-})(jQuery);

From 93560919035ca910c77cb2a1b251cf2267b8fb78 Mon Sep 17 00:00:00 2001
From: joyqi <magike.net@gmail.com>
Date: Tue, 15 Oct 2013 00:49:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/file-upload-js.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/file-upload-js.php b/admin/file-upload-js.php
index 6b2e40c6..9ab87669 100644
--- a/admin/file-upload-js.php
+++ b/admin/file-upload-js.php
@@ -99,6 +99,8 @@ $(document).ready(function() {
         echo ceil($val / (1024 * 1024));
         ?>,
 
+        queuefiles      :   5,
+
         error: function(err, file) {
             switch(err) {
                 case 'BrowserNotSupported':