Skip to content

Commit 4c78c19

Browse files
committed
update plupload submodule
1 parent 3ede36b commit 4c78c19

13 files changed

Lines changed: 1385 additions & 1307 deletions

File tree

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ language: node_js
22
node_js:
33
- 0.10
44
before_script:
5-
- npm install -g grunt-cli
65
- npm install
76
- bower install
0 Bytes
Binary file not shown.
-345 Bytes
Binary file not shown.

dist/assets/lib/plupload/js/jquery.plupload.queue/jquery.plupload.queue.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ used as it is.
7171
7272
@param {Boolean} [settings.dragdrop=true] Enable ability to add file to the queue by drag'n'dropping them from the desktop.
7373
@param {Boolean} [settings.rename=false] Enable ability to rename files in the queue.
74-
@param {Boolean} [settings.multiple_queues=false] Re-activate the widget after each upload procedure.
74+
@param {Boolean} [settings.multiple_queues=true] Re-activate the widget after each upload procedure.
7575
*/
7676
(function($) {
7777
var uploaders = {};
@@ -162,6 +162,11 @@ used as it is.
162162

163163
uploaders[id] = uploader;
164164

165+
// Enable drag/drop (see PostInit handler as well)
166+
if (uploader.settings.dragdrop) {
167+
uploader.settings.drop_element = id + '_filelist';
168+
}
169+
165170
function handleStatus(file) {
166171
var actionClass;
167172

@@ -301,12 +306,6 @@ used as it is.
301306
});
302307
}
303308

304-
305-
// Enable drag/drop (see PostInit handler as well)
306-
if (up.settings.dragdrop) {
307-
up.settings.drop_element = id + '_filelist';
308-
}
309-
310309
$('#' + id + '_container').attr('title', 'Using runtime: ' + res.runtime);
311310

312311
$('a.plupload_start', target).click(function(e) {

dist/assets/lib/plupload/js/jquery.plupload.queue/jquery.plupload.queue.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)