diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 6ef7e8e79..acbb39da9 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -1242,6 +1242,7 @@ define(function () { out.autostore_error = "Unexpected error: we were unable to store this pad, please try again."; out.autostore_saved = "The pad was successfully stored in your CryptDrive!"; out.autostore_forceSave = "Store the file in CryptDrive"; // File upload modal + out.autostore_notAvailable = "You must store this pad in your CryptDrive before being able to use this feature."; // Properties/tags/move to trash return out; }); diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index cc918afc5..0f8d31333 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -722,27 +722,32 @@ define([ button .click(common.prepareFeedback(type)) .click(function() { - sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) { - if (err || res.error) { return void console.log(err || res.error); } - var msg = Messages.forgetPrompt; - if (res) { - UI.alert(Messages.sharedFolders_forget); - return; - } else if (!common.isLoggedIn()) { - msg = Messages.fm_removePermanentlyDialog; + common.isPadStored(function (err, data) { + if (!data) { + return void UI.alert(Messages.autostore_notAvailable); } - UI.confirm(msg, function (yes) { - if (!yes) { return; } - sframeChan.query('Q_MOVE_TO_TRASH', null, function (err) { - if (err) { return void callback(err); } - var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted; - var msg = common.fixLinks($('
').html(cMsg)); - UI.alert(msg); - callback(); + sframeChan.query('Q_IS_ONLY_IN_SHARED_FOLDER', null, function (err, res) { + if (err || res.error) { return void console.log(err || res.error); } + var msg = Messages.forgetPrompt; + if (res) { + UI.alert(Messages.sharedFolders_forget); return; + } else if (!common.isLoggedIn()) { + msg = Messages.fm_removePermanentlyDialog; + } + UI.confirm(msg, function (yes) { + if (!yes) { return; } + sframeChan.query('Q_MOVE_TO_TRASH', null, function (err) { + if (err) { return void callback(err); } + var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted; + var msg = common.fixLinks($('
').html(cMsg)); + UI.alert(msg); + callback(); + return; + }); }); - }); + }); }); }); break; @@ -807,7 +812,14 @@ define([ title: Messages.tags_title, }) .click(common.prepareFeedback(type)) - .click(function () { UIElements.updateTags(common, null); }); + .click(function () { + common.isPadStored(function (err, data) { + if (!data) { + return void UI.alert(Messages.autostore_notAvailable); + } + UIElements.updateTags(common, null); + }); + }); break; case 'toggle': button = $('