Added new language strings

dev/App/User.js

@@ -97,6 +97,12 @@
 			Events.pub('interval.20m');
 		}, 60000 * 15);
 
+		window.setTimeout(function () {
+			window.setInterval(function () {
+				Events.pub('interval.2m-after5m');
+			}, 60000 * 2);
+		}, 60000 * 5);
+
 		window.setTimeout(function () {
 			window.setInterval(function () {
 				Events.pub('interval.5m-after5m');
@@ -763,7 +769,7 @@
 		var
 			self = this,
 			iUtc = Momentor.momentNowUnix(),
-			aFolders = FolderStore.getNextFolderNames(bBoot)
+			aFolders = FolderStore.getNextFolderNames()
 		;
 
 		if (Utils.isNonEmptyArray(aFolders))
@@ -833,7 +839,8 @@
 						});
 
 						if (bBoot)
-						{	_.delay(function () {
+						{
+							_.delay(function () {
 								self.folderInformationMultiply(true);
 							}, 2000);
 						}
@@ -1361,7 +1368,7 @@
 							}
 						});
 
-						Events.sub('interval.5m-after5m', function () {
+						Events.sub('interval.2m-after5m', function () {
 							self.folderInformationMultiply();
 						});
 

dev/Model/Folder.js

@@ -43,6 +43,7 @@
 		this.edited = ko.observable(false);
 		this.collapsed = ko.observable(true);
 		this.subScribed = ko.observable(true);
+		this.checkable = ko.observable(false);
 		this.subFolders = ko.observableArray([]);
 		this.deleteAccess = ko.observable(false);
 		this.actionBlink = ko.observable(false).extend({'falseTimeout': 1000});
@@ -105,6 +106,7 @@
 		}, this);
 
 		this.hidden = ko.computed(function () {
+
 			var
 				bSystem = this.isSystemFolder(),
 				bSubFolders = this.hasSubScribedSubfolders()
@@ -182,6 +184,8 @@
 			return !this.isSystemFolder() && this.selectable && sInboxFolderName !== this.fullNameRaw;
 		}, this);
 
+		this.canBeChecked = this.canBeSubScribed;
+
 //		this.visible.subscribe(function () {
 //			Utils.timeOutAction('folder-list-folder-visibility-change', function () {
 //				Globals.$win.trigger('folder-list-folder-visibility-change');
@@ -281,7 +285,8 @@
 		});
 
 		this.hasUnreadMessages = ko.computed(function () {
-			return 0 < this.messageCountUnread();
+			return 0 < this.messageCountUnread() &&
+				(this.isSystemFolder() || this.checkable());
 		}, this);
 
 		this.hasSubScribedUnreadMessagesSubfolders = ko.computed(function () {
@@ -352,6 +357,8 @@
 			this.existen = !!oJsonFolder.IsExists;
 
 			this.subScribed(!!oJsonFolder.IsSubscribed);
+			this.checkable(!!oJsonFolder.Checkable);
+
 			this.type(sInboxFolderName === this.fullNameRaw ? Enums.FolderType.Inbox : Enums.FolderType.User);
 
 			bResult = true;

dev/Remote/User/Ajax.js

@@ -708,6 +708,19 @@
 		});
 	};
 
+	/**
+	 * @param {?Function} fCallback
+	 * @param {string} sFolderFullNameRaw
+	 * @param {boolean} bCheckable
+	 */
+	RemoteUserAjax.prototype.folderSetCheckable = function (fCallback, sFolderFullNameRaw, bCheckable)
+	{
+		this.defaultRequest(fCallback, 'FolderCheckable', {
+			'Folder': sFolderFullNameRaw,
+			'Checkable': bCheckable ? '1' : '0'
+		});
+	};
+
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolder

dev/Settings/User/Folders.js

@@ -28,6 +28,8 @@
 	{
 		this.folderList = FolderStore.folderList;
 
+		this.folderListHelp = ko.observable('').extend({'throttle': 100});
+
 		this.loading = ko.computed(function () {
 
 			var
@@ -95,6 +97,25 @@
 		FolderStore.folderList.error('');
 	};
 
+	FoldersUserSettings.prototype.onBuild = function (oDom)
+	{
+		var self = this;
+		oDom
+			.on('mouseover', '.delete-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_DELETE_FOLDER'));
+			})
+			.on('mouseover', '.subscribe-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER'));
+			})
+			.on('mouseover', '.check-folder-parent', function () {
+				self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER_COUNT'));
+			})
+			.on('mouseout', '.subscribe-folder-parent, .check-folder-parent, .delete-folder-parent', function () {
+				self.folderListHelp('');
+			})
+		;
+	};
+
 	FoldersUserSettings.prototype.createFolder = function ()
 	{
 		require('Knoin/Knoin').showScreenPopup(require('View/Popup/FolderCreate'));
@@ -160,6 +181,20 @@
 		oFolder.subScribed(false);
 	};
 
+	FoldersUserSettings.prototype.checkableTrueFolder = function (oFolder)
+	{
+		Remote.folderSetCheckable(Utils.emptyFunction, oFolder.fullNameRaw, true);
+
+		oFolder.checkable(true);
+	};
+
+	FoldersUserSettings.prototype.checkableFalseFolder = function (oFolder)
+	{
+		Remote.folderSetCheckable(Utils.emptyFunction, oFolder.fullNameRaw, false);
+
+		oFolder.checkable(false);
+	};
+
 	module.exports = FoldersUserSettings;
 
 }());

dev/Stores/User/Folder.js

@@ -181,13 +181,10 @@
 	};
 
 	/**
-	 * @param {boolean=} bBoot = false
 	 * @return {Array}
 	 */
-	FolderUserStore.prototype.getNextFolderNames = function (bBoot)
+	FolderUserStore.prototype.getNextFolderNames = function ()
 	{
-		bBoot = Utils.isUnd(bBoot) ? false : !!bBoot;
-
 		var
 			aResult = [],
 			iLimit = 5,
@@ -200,7 +197,8 @@
 					if (oFolder && sInboxFolderName !== oFolder.fullNameRaw &&
 						oFolder.selectable && oFolder.existen &&
 						iTimeout > oFolder.interval &&
-						(!bBoot || oFolder.subScribed()))
+						(oFolder.isSystemFolder() || (oFolder.subScribed() && oFolder.checkable()))
+					)
 					{
 						aTimeouts.push([oFolder.interval, oFolder.fullNameRaw]);
 					}
@@ -236,7 +234,9 @@
 			return iLimit <= aResult.length;
 		});
 
-		return _.uniq(aResult);
+		aResult = _.uniq(aResult);
+
+		return aResult;
 	};
 
 	module.exports = new FolderUserStore();

dev/Styles/SettingsFolders.less

@@ -86,7 +86,7 @@
 			}
 		}
 
-		.delete-folder, .subscribe-folder, .unsubscribe-folder {
+		.delete-folder, .subscribe-folder, .unsubscribe-folder, .check-folder, .uncheck-folder {
 			cursor: pointer;
 			opacity: 0.6;
 		}
@@ -94,6 +94,10 @@
 		.unsubscribe-folder {
 			opacity: 0.2;
 		}
+
+		.uncheck-folder {
+			opacity: 0.1;
+		}
 	}
 
 	.folder-padding.deep-1 {