Skip to content

Commit

Permalink
Update js/.
Browse files Browse the repository at this point in the history
  • Loading branch information
jayarjo committed Dec 27, 2013
1 parent 311d453 commit c277361
Show file tree
Hide file tree
Showing 10 changed files with 610 additions and 167 deletions.
Binary file modified js/Moxie.swf
Binary file not shown.
11 changes: 10 additions & 1 deletion js/jquery.plupload.queue/jquery.plupload.queue.js
Expand Up @@ -386,7 +386,16 @@ used as it is.
}
});

uploader.bind('QueueChanged', updateList);
uploader.bind('FilesAdded', updateList);

uploader.bind('FilesRemoved', function() {
// since the whole file list is redrawn for every change in the queue
// we need to scroll back to the file removal point to avoid annoying
// scrolling to the bottom bug (see #926)
var scrollTop = $('#' + id + '_filelist').scrollTop();
updateList();
$('#' + id + '_filelist').scrollTop(scrollTop);
});

uploader.bind('FileUploaded', function(up, file) {
handleStatus(file);
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.plupload.queue/jquery.plupload.queue.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions js/jquery.ui.plupload/jquery.ui.plupload.js
Expand Up @@ -213,8 +213,8 @@ function renderUI(obj) {
'<div class="plupload_header_title">' + _('Select files') + '</div>' +
'<div class="plupload_header_text">' + _('Add files to the upload queue and click the start button.') + '</div>' +
'<div class="plupload_view_switch">' +
'<input type="radio" id="'+obj.id+'_view_list" name="view_mode_'+obj.id+'" checked="checked" /> <label class="plupload_button" for="'+obj.id+'_view_list" data-view="list">' + _('List') + '</label>' +
'<input type="radio" id="'+obj.id+'_view_thumbs" name="view_mode_'+obj.id+'" /> <label class="plupload_button" for="'+obj.id+'_view_thumbs" data-view="thumbs">' + _('Thumbnails') + '</label>' +
'<input type="radio" id="'+obj.id+'_view_list" name="view_mode_'+obj.id+'" checked="checked" /><label class="plupload_button" for="'+obj.id+'_view_list" data-view="list">' + _('List') + '</label>' +
'<input type="radio" id="'+obj.id+'_view_thumbs" name="view_mode_'+obj.id+'" /><label class="plupload_button" for="'+obj.id+'_view_thumbs" data-view="thumbs">' + _('Thumbnails') + '</label>' +
'</div>' +
'</div>' +
'</div>' +
Expand Down Expand Up @@ -1025,16 +1025,11 @@ $.widget("ui.plupload", {
});
};

img.onembedded = function() {
img.bind("embedded error", function() {
$('#' + file.id, self.filelist).addClass('plupload_file_thumb_loaded');
this.destroy();
setTimeout(cb, 1); // detach, otherwise ui might hang (in SilverLight for example)
};

img.onerror = function() {
this.destroy();
setTimeout(cb, 1);
};
});

img.load(file.getSource());
}
Expand Down Expand Up @@ -1118,7 +1113,9 @@ $.widget("ui.plupload", {
}

$.each(files, function(i, file) {
$('#' + file.id).remove();
$('#' + file.id).toggle("highlight", function() {
this.remove();
});
up.removeFile(file);
});

Expand Down
2 changes: 1 addition & 1 deletion js/jquery.ui.plupload/jquery.ui.plupload.min.js

Large diffs are not rendered by default.

0 comments on commit c277361

Please sign in to comment.