Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 03:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecated uploader.open, use uploader.show instead

Browse Source 
... as it now takes a single Object argument instead of multiple
parameters.

Also, closes #3942. Help text is just omitted now.
This commit is contained in:
Julian Lam
2015-12-14 12:00:24 -05:00
parent 84a039446c
commit c1460d36f0
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/src/modules/uploader.js
View File

@@ -2,12 +2,24 @@
/* globals define, templates, translator */
define('uploader', ['csrf'], function(csrf) {
define('uploader', ['csrf', 'translator'], function(csrf, translator) {
var module = {};
module.open = function(route, params, fileSize, callback) {
parseModal(function(uploadModal) {
console.warn('[uploader] uploader.open() is deprecated, please use uploader.show() instead, and pass parameters as a singe option with callback, e.g. uploader.show({}, callback);');
module.show({
route: route,
params: params,
fileSize: fileSize
}, callback);
};
module.show = function(data, callback) {
parseModal({
showHelp: data.hasOwnProperty('showHelp') && data.showHelp !== undefined ? data.showHelp : true,
fileSize: data.hasOwnProperty('fileSize') && data.fileSize !== undefined ? parseInt(data.fileSize, 10) : false
}, function(uploadModal) {
uploadModal = $(uploadModal);
uploadModal.modal('show');
@@ -16,16 +28,8 @@ define('uploader', ['csrf'], function(csrf) {
});
var uploadForm = uploadModal.find('#uploadForm');
uploadForm.attr('action', route);
uploadForm.find('#params').val(JSON.stringify(params));
if (fileSize) {
uploadForm.find('#file-size-block')
.translateText('([[uploads:maximum-file-size, ' + fileSize + ']])')
.removeClass('hide');
} else {
uploadForm.find('#file-size-block').addClass('hide');
}
uploadForm.attr('action', data.route);
uploadForm.find('#params').val(JSON.stringify(data.params));
uploadModal.find('#pictureUploadSubmitBtn').off('click').on('click', function() {
uploadForm.submit();
@@ -84,8 +88,8 @@ define('uploader', ['csrf'], function(csrf) {
});
};
function parseModal(callback) {
templates.parse('partials/modals/upload_picture_modal', {}, function(html) {
function parseModal(tplVals, callback) {
templates.parse('partials/modals/upload_picture_modal', tplVals, function(html) {
translator.translate(html, callback);
});
}