Add ask popup (messages permanent deletion)

dev/ViewModels/MailBoxMessageListViewModel.js

@@ -111,6 +111,10 @@ function MailBoxMessageListViewModel()
 		return RL.data().spamFolder() === this.messageListEndFolder();
 	}, this);
 
+	this.isSpamDisabled = ko.computed(function () {
+		return Consts.Values.UnuseOptionValue === RL.data().spamFolder();
+	}, this);
+
 	this.isTrashFolder = ko.computed(function () {
 		return RL.data().trashFolder() === this.messageListEndFolder();
 	}, this);
@@ -187,6 +191,8 @@ function MailBoxMessageListViewModel()
 		}, this)
 	;
 
+	this.moveOrDeleteResponse = _.bind(this.moveOrDeleteResponse, this);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -352,7 +358,7 @@ MailBoxMessageListViewModel.prototype.moveMessagesToFolder = function (sFromFold
 			bCopy = Utils.isUnd(bCopy) ? false : !!bCopy;
 
 			RL.remote()[bCopy ? 'messagesCopy' : 'messagesMove'](
-				_.bind(this.moveOrDeleteResponse, this),
+				this.moveOrDeleteResponse,
 				oFromFolder.fullNameRaw,
 				oToFolder.fullNameRaw,
 				aUidForRemove
@@ -392,30 +398,48 @@ MailBoxMessageListViewModel.prototype.deleteSelectedMessageFromCurrentFolder = f
 	if (this.canBeMoved())
 	{
 		bUseFolder = Utils.isUnd(bUseFolder) ? true : !!bUseFolder;
-		var oTrashOrSpamFolder = RL.cache().getFolderFromCacheList(
+		if (bUseFolder)
-			Enums.FolderType.Spam === iType ? RL.data().spamFolder() : RL.data().trashFolder());
+		{
+			if ((Enums.FolderType.Spam === iType && Consts.Values.UnuseOptionValue === RL.data().spamFolder()) ||
+				(Enums.FolderType.Trash === iType && Consts.Values.UnuseOptionValue === RL.data().trashFolder()))
+			{
+				bUseFolder = false;
+			}
+		}
+
+		var 
+			self = this,
+			aUIds = null,
+			sCurrentFolderFullNameRaw = RL.data().currentFolderFullNameRaw(),
+			oTrashOrSpamFolder = RL.cache().getFolderFromCacheList(
+				Enums.FolderType.Spam === iType ? RL.data().spamFolder() : RL.data().trashFolder())
+		;
 
 		if (!oTrashOrSpamFolder && bUseFolder)
 		{
 			kn.showScreenPopup(PopupsFolderSystemViewModel, [
 				Enums.FolderType.Spam === iType ? Enums.SetSystemFoldersNotification.Spam : Enums.SetSystemFoldersNotification.Trash]);
 		}
-		else if (!bUseFolder || (oTrashOrSpamFolder && (Consts.Values.UnuseOptionValue === oTrashOrSpamFolder.fullNameRaw ||
+		else if (!bUseFolder || (oTrashOrSpamFolder && RL.data().currentFolderFullNameRaw() === oTrashOrSpamFolder.fullNameRaw))
-			RL.data().currentFolderFullNameRaw() === oTrashOrSpamFolder.fullNameRaw)))
 		{
-			RL.remote().messagesDelete(
+			aUIds = RL.data().messageListCheckedOrSelectedUidsWithSubMails();
-				_.bind(this.moveOrDeleteResponse, this),
+			
-				RL.data().currentFolderFullNameRaw(),
+			kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), function () {
-				RL.data().messageListCheckedOrSelectedUidsWithSubMails()
-			);
 
-			this.removeCheckedOrSelectedMessagesFromList();
+				RL.remote().messagesDelete(
+					self.moveOrDeleteResponse,
+					sCurrentFolderFullNameRaw,
+					aUIds
+				);
+		
+				self.removeCheckedOrSelectedMessagesFromList();
+			}]);
 		}
 		else if (oTrashOrSpamFolder)
 		{
 			RL.remote().messagesMove(
-				_.bind(this.moveOrDeleteResponse, this),
+				this.moveOrDeleteResponse,
-				RL.data().currentFolderFullNameRaw(),
+				sCurrentFolderFullNameRaw,
 				oTrashOrSpamFolder.fullNameRaw,
 				RL.data().messageListCheckedOrSelectedUidsWithSubMails()
 			);

package.json

@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.5.1",
-	"release": "550",
+	"release": "553",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "Gruntfile.js",

rainloop/v/0.0.0/app/templates/Views/MailMessageList.html

@@ -26,8 +26,8 @@
 						<i class="icon-trash icon-white"></i>
 						<span data-bind="text: 1 < messageListCheckedOrSelectedUidsWithSubMails().length ? ' (' + messageListCheckedOrSelectedUidsWithSubMails().length + ')' : ''"></span>
 					</a>
-					<span style="font-size:10px;">&nbsp;</span>
+					<span style="font-size:10px;" data-bind="visible: !isSpamFolder() && !isSpamDisabled()">&nbsp;</span>
-					<a class="btn buttonSpam" data-placement="bottom" data-bind="visible: !isSpamFolder(), command: spamCommand, tooltip: 'MESSAGE_LIST/BUTTON_SPAM'">
+					<a class="btn buttonSpam" data-placement="bottom" data-bind="visible: !isSpamFolder() && !isSpamDisabled(), command: spamCommand, tooltip: 'MESSAGE_LIST/BUTTON_SPAM'">
 						<i class="icon-bug"></i>
 					</a>
 				</div>

rainloop/v/0.0.0/langs/de.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Geben Sie bitte mindestens einen Empfänger an"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/en.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Please specify at least one recipient"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/es.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Por favor especifique al menos un destinatario"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/fr.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "S'il vous plaît spécifier au moins un destinataire"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choisir la langue"

rainloop/v/0.0.0/langs/is.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Vinsamlegast taktu fram að minnsta kosti einn viðtakand
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/ko-kr.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "수신인을 한 명 이상 선택하세요"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "사용할 언어를 선택하세요"

rainloop/v/0.0.0/langs/lv.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Pievienojat vismaz vienu saņēmēju"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/nl.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Gelieve minstens 1 ontvanger aan te duiden"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Kies uw taal"

rainloop/v/0.0.0/langs/pl.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Wprowadź co najmniej jednego odbiorcę"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/pt-br.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Por favor, especifique pelo menos um destinatário"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/pt-pt.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Por favor, especifique pelo menos um destinatário"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Choose language"

rainloop/v/0.0.0/langs/ru.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "Укажите как минимум одного пол
 BUTTON_YES = "Да"
 BUTTON_NO = "Нет"
 DESC_WANT_CLOSE_THIS_WINDOW = "Вы уверены, что хотите закрыть это окно?"
+DESC_WANT_DELETE_MESSAGES = "Вы уверены, что хотите удалить сообщение(я)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "Выберите язык"

rainloop/v/0.0.0/langs/zh-cn.ini

@@ -177,6 +177,7 @@ EMPTY_TO_ERROR_DESC = "请至少选择一位接收人"
 BUTTON_YES = "Yes"
 BUTTON_NO = "No"
 DESC_WANT_CLOSE_THIS_WINDOW = "Are you sure you want to close this window?"
+DESC_WANT_DELETE_MESSAGES = "Are you sure you want to delete this message(s)?"
 
 [POPUPS_LANGUAGES]
 TITLE_LANGUAGES = "选择语言"

rainloop/v/0.0.0/static/js/app.js

@@ -10966,6 +10966,10 @@ function MailBoxMessageListViewModel()
 		return RL.data().spamFolder() === this.messageListEndFolder();
 	}, this);
 
+	this.isSpamDisabled = ko.computed(function () {
+		return Consts.Values.UnuseOptionValue === RL.data().spamFolder();
+	}, this);
+
 	this.isTrashFolder = ko.computed(function () {
 		return RL.data().trashFolder() === this.messageListEndFolder();
 	}, this);
@@ -11042,6 +11046,8 @@ function MailBoxMessageListViewModel()
 		}, this)
 	;
 
+	this.moveOrDeleteResponse = _.bind(this.moveOrDeleteResponse, this);
+
 	Knoin.constructorEnd(this);
 }
 
@@ -11207,7 +11213,7 @@ MailBoxMessageListViewModel.prototype.moveMessagesToFolder = function (sFromFold
 			bCopy = Utils.isUnd(bCopy) ? false : !!bCopy;
 
 			RL.remote()[bCopy ? 'messagesCopy' : 'messagesMove'](
-				_.bind(this.moveOrDeleteResponse, this),
+				this.moveOrDeleteResponse,
 				oFromFolder.fullNameRaw,
 				oToFolder.fullNameRaw,
 				aUidForRemove
@@ -11247,30 +11253,48 @@ MailBoxMessageListViewModel.prototype.deleteSelectedMessageFromCurrentFolder = f
 	if (this.canBeMoved())
 	{
 		bUseFolder = Utils.isUnd(bUseFolder) ? true : !!bUseFolder;
-		var oTrashOrSpamFolder = RL.cache().getFolderFromCacheList(
+		if (bUseFolder)
-			Enums.FolderType.Spam === iType ? RL.data().spamFolder() : RL.data().trashFolder());
+		{
+			if ((Enums.FolderType.Spam === iType && Consts.Values.UnuseOptionValue === RL.data().spamFolder()) ||
+				(Enums.FolderType.Trash === iType && Consts.Values.UnuseOptionValue === RL.data().trashFolder()))
+			{
+				bUseFolder = false;
+			}
+		}
+
+		var 
+			self = this,
+			aUIds = null,
+			sCurrentFolderFullNameRaw = RL.data().currentFolderFullNameRaw(),
+			oTrashOrSpamFolder = RL.cache().getFolderFromCacheList(
+				Enums.FolderType.Spam === iType ? RL.data().spamFolder() : RL.data().trashFolder())
+		;
 
 		if (!oTrashOrSpamFolder && bUseFolder)
 		{
 			kn.showScreenPopup(PopupsFolderSystemViewModel, [
 				Enums.FolderType.Spam === iType ? Enums.SetSystemFoldersNotification.Spam : Enums.SetSystemFoldersNotification.Trash]);
 		}
-		else if (!bUseFolder || (oTrashOrSpamFolder && (Consts.Values.UnuseOptionValue === oTrashOrSpamFolder.fullNameRaw ||
+		else if (!bUseFolder || (oTrashOrSpamFolder && RL.data().currentFolderFullNameRaw() === oTrashOrSpamFolder.fullNameRaw))
-			RL.data().currentFolderFullNameRaw() === oTrashOrSpamFolder.fullNameRaw)))
 		{
-			RL.remote().messagesDelete(
+			aUIds = RL.data().messageListCheckedOrSelectedUidsWithSubMails();
-				_.bind(this.moveOrDeleteResponse, this),
+			
-				RL.data().currentFolderFullNameRaw(),
+			kn.showScreenPopup(PopupsAskViewModel, [Utils.i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'), function () {
-				RL.data().messageListCheckedOrSelectedUidsWithSubMails()
-			);
 
-			this.removeCheckedOrSelectedMessagesFromList();
+				RL.remote().messagesDelete(
+					self.moveOrDeleteResponse,
+					sCurrentFolderFullNameRaw,
+					aUIds
+				);
+		
+				self.removeCheckedOrSelectedMessagesFromList();
+			}]);
 		}
 		else if (oTrashOrSpamFolder)
 		{
 			RL.remote().messagesMove(
-				_.bind(this.moveOrDeleteResponse, this),
+				this.moveOrDeleteResponse,
-				RL.data().currentFolderFullNameRaw(),
+				sCurrentFolderFullNameRaw,
 				oTrashOrSpamFolder.fullNameRaw,
 				RL.data().messageListCheckedOrSelectedUidsWithSubMails()
 			);