mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander 2015-05-28 16:03:24 +02:00
commit b02700a62f
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
phpBB/assets/javascript/plupload.js
View File

@ -12,14 +12,14 @@ phpbb.plupload.ids = [];
*/ */
phpbb.plupload.initialize = function() { phpbb.plupload.initialize = function() {
// Initialize the Plupload uploader. // Initialize the Plupload uploader.
uploader.init(); phpbb.plupload.uploader.init();
// Set attachment data. // Set attachment data.
phpbb.plupload.setData(phpbb.plupload.data); phpbb.plupload.setData(phpbb.plupload.data);
phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData()); phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
// Only execute if Plupload initialized successfully. // Only execute if Plupload initialized successfully.
uploader.bind('Init', function() { phpbb.plupload.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;
@ -29,18 +29,18 @@ phpbb.plupload.initialize = function() {
$('#attach-panel-multi').show(); $('#attach-panel-multi').show();
}); });
uploader.bind('PostInit', function() { phpbb.plupload.uploader.bind('PostInit', function() {
// 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 (phpbb.plupload.uploader.features.dragdrop) {
$('#drag-n-drop-message').show(); $('#drag-n-drop-message').show();
} }
// Ensure "Add files" button position is correctly calculated. // Ensure "Add files" button position is correctly calculated.
if ($('#attach-panel-multi').is(':visible')) { if ($('#attach-panel-multi').is(':visible')) {
uploader.refresh(); phpbb.plupload.uploader.refresh();
} }
$('[data-subpanel="attach-panel"]').one('click', function() { $('[data-subpanel="attach-panel"]').one('click', function() {
uploader.refresh(); phpbb.plupload.uploader.refresh();
}); });
}); });
}; };
@ -52,13 +52,13 @@ phpbb.plupload.initialize = function() {
* @return undefined * @return undefined
*/ */
phpbb.plupload.clearParams = function() { phpbb.plupload.clearParams = function() {
var obj = uploader.settings.multipart_params; var obj = phpbb.plupload.uploader.settings.multipart_params;
for (var key in obj) { for (var key in obj) {
if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) { if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) {
continue; continue;
} }
delete uploader.settings.multipart_params[key]; delete phpbb.plupload.uploader.settings.multipart_params[key];
} }
}; };
@ -69,8 +69,8 @@ phpbb.plupload.clearParams = function() {
* @return undefined * @return undefined
*/ */
phpbb.plupload.updateMultipartParams = function(obj) { phpbb.plupload.updateMultipartParams = function(obj) {
uploader.settings.multipart_params = $.extend( phpbb.plupload.uploader.settings.multipart_params = $.extend(
uploader.settings.multipart_params, phpbb.plupload.uploader.settings.multipart_params,
obj obj
); );
}; };
@ -238,8 +238,8 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
phpbb.plupload.deleteFile = function(row, attachId) { phpbb.plupload.deleteFile = function(row, attachId) {
// If there's no attach id, then the file hasn't been uploaded. Simply delete the row. // If there's no attach id, then the file hasn't been uploaded. Simply delete the row.
if (typeof attachId === 'undefined') { if (typeof attachId === 'undefined') {
var file = uploader.getFile(row.attr('id')); var file = phpbb.plupload.uploader.getFile(row.attr('id'));
uploader.removeFile(file); phpbb.plupload.uploader.removeFile(file);
row.slideUp(100, function() { row.slideUp(100, function() {
row.remove(); row.remove();
@ -267,7 +267,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
// trigger_error() was called which likely means a permission error was encountered. // trigger_error() was called which likely means a permission error was encountered.
if (typeof response.title !== 'undefined') { if (typeof response.title !== 'undefined') {
uploader.trigger('Error', {message: response.message}); phpbb.plupload.uploader.trigger('Error', {message: response.message});
// We will have to assume that the deletion failed. So leave the file status as uploaded. // We will have to assume that the deletion failed. So leave the file status as uploaded.
row.find('.file-status').toggleClass('file-uploaded'); row.find('.file-status').toggleClass('file-uploaded');
@ -278,15 +278,15 @@ phpbb.plupload.deleteFile = function(row, attachId) {
phpbb.plupload.handleMaxFilesReached(); phpbb.plupload.handleMaxFilesReached();
if (row.attr('id')) { if (row.attr('id')) {
var file = uploader.getFile(row.attr('id')); var file = phpbb.plupload.uploader.getFile(row.attr('id'));
uploader.removeFile(file); phpbb.plupload.uploader.removeFile(file);
} }
row.slideUp(100, function() { row.slideUp(100, function() {
row.remove(); row.remove();
// Hide the file list if it's empty now. // Hide the file list if it's empty now.
phpbb.plupload.hideEmptyList(); phpbb.plupload.hideEmptyList();
}); });
uploader.trigger('FilesRemoved'); phpbb.plupload.uploader.trigger('FilesRemoved');
}; };
$.ajax(phpbb.plupload.config.url, { $.ajax(phpbb.plupload.config.url, {
@ -374,7 +374,7 @@ phpbb.plupload.updateBbcode = function(action, index) {
phpbb.plupload.getFilesByStatus = function(status) { phpbb.plupload.getFilesByStatus = function(status) {
var files = []; var files = [];
$.each(uploader.files, function(i, file) { $.each(phpbb.plupload.uploader.files, function(i, file) {
if (file.status === status) { if (file.status === status) {
files.push(file); files.push(file);
} }
@ -400,7 +400,7 @@ phpbb.plupload.handleMaxFilesReached = function() {
phpbb.plupload.markQueuedFailed(phpbb.plupload.lang.TOO_MANY_ATTACHMENTS); phpbb.plupload.markQueuedFailed(phpbb.plupload.lang.TOO_MANY_ATTACHMENTS);
// Disable the uploader. // Disable the uploader.
phpbb.plupload.disableUploader(); phpbb.plupload.disableUploader();
uploader.trigger('Error', {message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS}); phpbb.plupload.uploader.trigger('Error', {message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS});
return true; return true;
} else if(phpbb.plupload.maxFiles > phpbb.plupload.ids.length) { } else if(phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
@ -417,7 +417,7 @@ phpbb.plupload.handleMaxFilesReached = function() {
*/ */
phpbb.plupload.disableUploader = function() { phpbb.plupload.disableUploader = function() {
$('#add_files').addClass('disabled'); $('#add_files').addClass('disabled');
uploader.disableBrowse(); phpbb.plupload.uploader.disableBrowse();
} }
/** /**
@ -427,7 +427,7 @@ phpbb.plupload.disableUploader = function() {
*/ */
phpbb.plupload.enableUploader = function() { phpbb.plupload.enableUploader = function() {
$('#add_files').removeClass('disabled'); $('#add_files').removeClass('disabled');
uploader.disableBrowse(false); phpbb.plupload.uploader.disableBrowse(false);
} }
/** /**
@ -464,7 +464,7 @@ phpbb.plupload.fileError = function(file, error) {
/** /**
* Set up the Plupload object and get some basic data. * Set up the Plupload object and get some basic data.
*/ */
var uploader = new plupload.Uploader(phpbb.plupload.config); phpbb.plupload.uploader = new plupload.Uploader(phpbb.plupload.config);
phpbb.plupload.initialize(); phpbb.plupload.initialize();
@ -503,7 +503,7 @@ $('#file-list').on('click', '.file-error', function(e) {
/** /**
* Fires when an error occurs. * Fires when an error occurs.
*/ */
uploader.bind('Error', function(up, error) { phpbb.plupload.uploader.bind('Error', function(up, error) {
error.file.name = plupload.xmlEncode(error.file.name); error.file.name = plupload.xmlEncode(error.file.name);
// The error message that Plupload provides for these is vague, so we'll be more specific. // The error message that Plupload provides for these is vague, so we'll be more specific.
@ -526,7 +526,7 @@ uploader.bind('Error', function(up, error) {
* *
* @return undefined * @return undefined
*/ */
uploader.bind('BeforeUpload', function(up, file) { phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
if (phpbb.plupload.handleMaxFilesReached()) { if (phpbb.plupload.handleMaxFilesReached()) {
return; return;
} }
@ -546,7 +546,7 @@ uploader.bind('BeforeUpload', function(up, file) {
* *
* @return undefined * @return undefined
*/ */
uploader.bind('ChunkUploaded', function(up, file, response) { phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
if (response.chunk >= response.chunks - 1) { if (response.chunk >= response.chunks - 1) {
return; return;
} }
@ -587,7 +587,7 @@ uploader.bind('ChunkUploaded', function(up, file, response) {
* *
* @return undefined * @return undefined
*/ */
uploader.bind('FilesAdded', function(up, files) { phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
// Prevent unnecessary requests to the server if the user already uploaded // Prevent unnecessary requests to the server if the user already uploaded
// the maximum number of files allowed. // the maximum number of files allowed.
if (phpbb.plupload.handleMaxFilesReached()) { if (phpbb.plupload.handleMaxFilesReached()) {
@ -634,7 +634,7 @@ uploader.bind('FilesAdded', function(up, files) {
* *
* @return undefined * @return undefined
*/ */
uploader.bind('FileUploaded', function(up, file, response) { phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
var json = {}, var json = {},
row = $('#' + file.id), row = $('#' + file.id),
error; error;
@ -680,7 +680,7 @@ uploader.bind('FileUploaded', function(up, file, response) {
* *
* @return undefined * @return undefined
*/ */
uploader.bind('UploadComplete', function(up, files) { phpbb.plupload.uploader.bind('UploadComplete', function(up, files) {
// Hide the progress bar // Hide the progress bar
setTimeout(function() { setTimeout(function() {
$('#file-total-progress-bar').fadeOut(500, function() { $('#file-total-progress-bar').fadeOut(500, function() {