makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prototech/ticket/12124' into develop

Browse source
This commit is contained in:
Joas Schilling 2014-02-02 13:15:29 +01:00
commit fecca29328
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
phpBB/assets/javascript/plupload.js
View file

@ -11,6 +11,15 @@ phpbb.plupload.ids = [];
* @return undefined * @return undefined
*/ */
phpbb.plupload.initialize = function() { phpbb.plupload.initialize = function() {
// Initialize the Plupload uploader.
uploader.init();
// Set attachment data.
phpbb.plupload.setData(phpbb.plupload.data);
phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
// Only execute if Plupload initialized successfully.
uploader.bind('Init', function() {
phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0], phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0],
phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML; phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML;
@ -18,18 +27,14 @@ phpbb.plupload.initialize = function() {
$('#attach-row-tpl, #attach-panel-basic').remove(); $('#attach-row-tpl, #attach-panel-basic').remove();
// Show multi-file upload options. // Show multi-file upload options.
$('#attach-panel-multi').show(); $('#attach-panel-multi').show();
});
// Set attachment data. uploader.bind('PostInit', function() {
phpbb.plupload.setData(phpbb.plupload.data);
phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
// Initialize the Plupload uploader.
uploader.init();
// Point out the drag-and-drop zone if it's supported. // Point out the drag-and-drop zone if it's supported.
if (!uploader.features.dragdrop) { if (uploader.features.dragdrop) {
$('#drag-n-drop-message').show(); $('#drag-n-drop-message').show();
} }
});
}; };
/** /**
@ -92,7 +97,7 @@ phpbb.plupload.getSerializedData = function() {
* @return int Returns the index of the file if it exists. * @return int Returns the index of the file if it exists.
*/ */
phpbb.plupload.getIndex = function(attach_id) { phpbb.plupload.getIndex = function(attach_id) {
var index = phpbb.plupload.ids.indexOf(Number(attach_id)); var index = $.inArray(Number(attach_id), phpbb.plupload.ids);
return (index !== -1) ? index : false; return (index !== -1) ? index : false;
}; };
@ -308,7 +313,7 @@ phpbb.plupload.hideEmptyList = function() {
* @return undefined * @return undefined
*/ */
phpbb.plupload.updateBbcode = function(action, index) { phpbb.plupload.updateBbcode = function(action, index) {
var textarea = $(phpbb.plupload.form).find('textarea[name="message"]'), var textarea = $('#message', phpbb.plupload.form),
text = textarea.val(), text = textarea.val(),
removal = (action === 'removal'); removal = (action === 'removal');