Move almost all libs to node_modules

Update libs
2026-08-31 21:19:21 +03:00 · 2016-07-29 22:14:51 +03:00 · 2016-07-29 22:14:51 +03:00 · c3985da102
commit c3985da102
parent b895c6ac1a
374 changed files with 17466 additions and 83393 deletions
--- a/dev/App/Abstract.jsx
+++ b/dev/App/Abstract.jsx
@ -330,7 +330,7 @@ class AbstractApp extends AbstractBoot
 		{
 			ssm.addState({
 				id: 'mobile',
-				maxWidth: 767,
+				query: '(max-width: 767px)',
 				onEnter: () => {
 					$html.addClass('ssm-state-mobile');
 					Events.pub('ssm.mobile-enter');
@ -343,8 +343,7 @@ class AbstractApp extends AbstractBoot

 			ssm.addState({
 				id: 'tablet',
-				minWidth: 768,
-				maxWidth: 999,
+				query: '(min-width: 768px) and (max-width: 999px)',
 				onEnter: function() {
 					$html.addClass('ssm-state-tablet');
 				},
@ -355,8 +354,7 @@ class AbstractApp extends AbstractBoot

 			ssm.addState({
 				id: 'desktop',
-				minWidth: 1000,
-				maxWidth: 1400,
+				query: '(min-width: 1000px) and (max-width: 1400px)',
 				onEnter: () => {
 					$html.addClass('ssm-state-desktop');
 				},
@ -367,7 +365,7 @@ class AbstractApp extends AbstractBoot

 			ssm.addState({
 				id: 'desktop-large',
-				minWidth: 1400,
+				query: '(min-width: 1401px)',
 				onEnter: () => {
 					$html.addClass('ssm-state-desktop-large');
 				},
@ -394,8 +392,6 @@ class AbstractApp extends AbstractBoot

 		leftPanelDisabled.valueHasMutated();

-		ssm.ready();
-
 		require('Stores/Language').populate();
 		require('Stores/Theme').populate();
 		require('Stores/Social').populate();
--- a/dev/Common/ClientStorageDriver/Cookie.jsx
+++ b/dev/Common/ClientStorageDriver/Cookie.jsx
@ -1,7 +1,6 @@

 import window from 'window';
-import $ from '$';
-import JSON from 'JSON';
+import Cookies from 'js-cookie';
 import {isUnd} from 'Common/Utils';
 import {CLIENT_SIDE_STORAGE_INDEX_NAME} from 'Common/Consts';

@ -20,8 +19,7 @@ class CookieDriver

 		try
 		{
-			const storageValue = $.cookie(CLIENT_SIDE_STORAGE_INDEX_NAME);
-			storageResult = null === storageValue ? null : JSON.parse(storageValue);
+			storageResult = Cookies.getJSON(CLIENT_SIDE_STORAGE_INDEX_NAME);
 		}
 		catch (e) {} // eslint-disable-line no-empty

@ -29,7 +27,7 @@ class CookieDriver

 		try
 		{
-			$.cookie(CLIENT_SIDE_STORAGE_INDEX_NAME, JSON.stringify(storageResult), {
+			Cookies.set(CLIENT_SIDE_STORAGE_INDEX_NAME, storageResult, {
 				expires: 30
 			});

@ -50,10 +48,7 @@ class CookieDriver

 		try
 		{
-			const
-				storageValue = $.cookie(CLIENT_SIDE_STORAGE_INDEX_NAME),
-				storageResult = null === storageValue ? null : JSON.parse(storageValue);
-
+			const storageResult = Cookies.getJSON(CLIENT_SIDE_STORAGE_INDEX_NAME);
 			result = (storageResult && !isUnd(storageResult[key])) ? storageResult[key] : null;
 		}
 		catch (e) {} // eslint-disable-line no-empty
--- a/dev/Common/Consts.jsx
+++ b/dev/Common/Consts.jsx
@ -1,5 +1,4 @@

-/* eslint max-len: 0 */
 export const MESSAGES_PER_PAGE = 20;

 export const MESSAGES_PER_PAGE_VALUES = [10, 20, 30, 50, 100];
@ -38,6 +37,7 @@ export const TOKEN_ERROR_LIMIT = 10;

 export const RAINLOOP_TRIAL_KEY = 'RAINLOOP-TRIAL-KEY';

+/* eslint max-len: 0 */
 export const DATA_IMAGE_USER_DOT_PIC = 'data:image/png;base64,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';

 export const DATA_IMAGE_TRANSP_PIC = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NkAAIAAAoAAggA9GkAAAAASUVORK5CYII=';
--- a/dev/Common/Momentor.jsx
+++ b/dev/Common/Momentor.jsx
@ -40,7 +40,7 @@ export function momentNowUnix()
 */
 export function searchSubtractFormatDateHelper(date)
 {
-	return momentNow().clone().subtract('days', date).format('YYYY.MM.DD');
+	return momentNow().clone().subtract(date, 'days').format('YYYY.MM.DD');
 }

 /**
@ -60,7 +60,7 @@ function formatCustomShortDate(m)
 				return i18n('MESSAGE_LIST/TODAY_AT', {
 					TIME: m.format('LT')
 				});
-			case now.clone().subtract('days', 1).format('L') === m.format('L'):
+			case now.clone().subtract(1, 'days').format('L') === m.format('L'):
 				return i18n('MESSAGE_LIST/YESTERDAY_AT', {
 					TIME: m.format('LT')
 				});
--- a/dev/Common/Utils.jsx
+++ b/dev/Common/Utils.jsx
@ -7,7 +7,6 @@ import {$win, $div, dropdownVisibility, data as GlobalsData} from 'Common/Global
 import {ComposeType, EventKeyCode, SaveSettingsStep, FolderType} from 'Common/Enums';
 import {Mime} from 'Common/Mime';

-import JSEncrypt from 'JSEncrypt';
 import Autolinker from 'Autolinker';

 const trim = $.trim;
@ -184,59 +183,6 @@ export function fakeMd5(len = 32)
 	return result;
 }

-let encryptObject = null;
-
-/**
- * @param {constructor} JSEncryptClass
- * @param {string} publicKey
- * @returns {JSEncrypt|boolean}
- */
-const rsaObject = (JSEncryptClass, publicKey) => {
-
-	if (JSEncryptClass && publicKey && (null === encryptObject || (encryptObject && encryptObject.__publicKey !== publicKey)) &&
-		window.crypto && window.crypto.getRandomValues)
-	{
-		encryptObject = new JSEncryptClass();
-		encryptObject.setPublicKey(publicKey);
-		encryptObject.__publicKey = publicKey;
-	}
-	else
-	{
-		encryptObject = false;
-	}
-
-	return encryptObject;
-};
-
-/**
- * @param {string} value
- * @param {string} publicKey
- * @returns {string}
- */
-const rsaEncode = (value, publicKey) => {
-
-	if (window.crypto && window.crypto.getRandomValues && publicKey)
-	{
-		let resultValue = false;
-		const encrypt = rsaObject(JSEncrypt, publicKey);
-
-		if (encrypt)
-		{
-			resultValue = encrypt.encrypt(fakeMd5() + ':' + value + ':' + fakeMd5());
-			if (false !== resultValue && isNormal(resultValue))
-			{
-				return 'rsa:xxx:' + resultValue;
-			}
-		}
-	}
-
-	return value;
-};
-
-rsaEncode.supported = !!(window.crypto && window.crypto.getRandomValues && false && JSEncrypt);
-
-export {rsaEncode};
-
 /**
 * @param {string} text
 * @returns {string}
@ -248,7 +194,7 @@ export function encodeHtml(text)

 /**
 * @param {string} text
- * @param {number=} iLen = 100
+ * @param {number=} len = 100
 * @returns {string}
 */
 export function splitPlainText(text, len = 100)
@ -312,15 +258,18 @@ export {timeOutAction, timeOutActionSecond};
 */
 export function inFocus()
 {
-	if (window.document.activeElement)
-	{
-		if (isUnd(window.document.activeElement.__inFocusCache))
+	try {
+		if (window.document.activeElement)
 		{
-			window.document.activeElement.__inFocusCache = $(window.document.activeElement).is('input,textarea,iframe,.cke_editable');
-		}
+			if (isUnd(window.document.activeElement.__inFocusCache))
+			{
+				window.document.activeElement.__inFocusCache = $(window.document.activeElement).is('input,textarea,iframe,.cke_editable');
+			}

-		return !!window.document.activeElement.__inFocusCache;
+			return !!window.document.activeElement.__inFocusCache;
+		}
 	}
+	catch (e) {} // eslint-disable-line no-empty

 	return false;
 }
@ -853,6 +802,8 @@ export function findEmailAndLinks(html)
 		urls: true,
 		email: true,
 		twitter: false,
+		phone: false,
+		hashtag: false,
 		replaceFn: function(autolinker, match) {
 			return !(autolinker && match && 'url' === match.getType() && match.matchedText && 0 !== match.matchedText.indexOf('http'));
 		}
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@ -449,14 +449,16 @@ ko.bindingHandlers.modal = {
 			Globals = require('Common/Globals'),
 			Utils = require('Common/Utils');

-		$(oElement).toggleClass('fade', !Globals.bMobileDevice).modal({
-			'keyboard': false,
-			'show': ko.unwrap(fValueAccessor())
-		})
-		.on('shown.koModal', Utils.windowResizeCallback)
-		.find('.close').on('click.koModal', function() {
-			fValueAccessor()(false);
-		});
+		$(oElement)
+			.toggleClass('fade', !Globals.bMobileDevice)
+			.modal({
+				'keyboard': false,
+				'show': ko.unwrap(fValueAccessor())
+			})
+			.on('shown.koModal', Utils.windowResizeCallback)
+			.find('.close').on('click.koModal', function() {
+				fValueAccessor()(false);
+			});

 		ko.utils.domNodeDisposal.addDisposeCallback(oElement, function() {
 			$(oElement)
--- a/dev/Model/Email.jsx
+++ b/dev/Model/Email.jsx
@ -172,7 +172,7 @@ class EmailModel
 			if (friendlyView && '' !== this.name)
 			{
 				result = wrapWithLink ? '<a href="mailto:' + encodeHtml('"' + this.name + '" <' + this.email + '>') +
-					'" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (encodeHtml ? encodeHtml(this.name) : this.name);
+					'" target="_blank" tabindex="-1">' + encodeHtml(this.name) + '</a>' : (useEncodeHtml ? encodeHtml(this.name) : this.name);
 			}
 			else
 			{
--- a/dev/Model/Folder.jsx
+++ b/dev/Model/Folder.jsx
@ -32,7 +32,6 @@ class FolderModel extends AbstractModel
 		this.focused = ko.observable(false);
 		this.selected = ko.observable(false);
 		this.edited = ko.observable(false);
-		this.collapsed = ko.observable(true);
 		this.subScribed = ko.observable(true);
 		this.checkable = ko.observable(false);
 		this.subFolders = ko.observableArray([]);
--- a/dev/Promises/User/Populator.js
+++ b/dev/Promises/User/Populator.js
@ -29,12 +29,12 @@ _.extend(PromisesUserPopulator.prototype, AbstractBasicPromises.prototype);

 /**
 * @param {string} sFullNameHash
+ * @param {Array?} expandedFolders
 * @returns {boolean}
 */
-PromisesUserPopulator.prototype.isFolderExpanded = function(sFullNameHash)
+PromisesUserPopulator.prototype.isFolderExpanded = function(sFullNameHash, expandedFolders)
 {
-	var aExpandedList = Local.get(Enums.ClientSideKeyName.ExpandedFolders);
-	return Utils.isArray(aExpandedList) && -1 !== _.indexOf(aExpandedList, sFullNameHash);
+	return expandedFolders && Utils.isArray(expandedFolders) && -1 !== _.indexOf(expandedFolders, sFullNameHash);
 };

 /**
@ -50,9 +50,10 @@ PromisesUserPopulator.prototype.normalizeFolder = function(sFolderFullNameRaw)
 /**
 * @param {string} sNamespace
 * @param {Array} aFolders
+ * @param {Array?} expandedFolders
 * @returns {Array}
 */
-PromisesUserPopulator.prototype.folderResponseParseRec = function(sNamespace, aFolders)
+PromisesUserPopulator.prototype.folderResponseParseRec = function(sNamespace, aFolders, expandedFolders)
 {
 	var
 		self = this,
@ -60,6 +61,7 @@ PromisesUserPopulator.prototype.folderResponseParseRec = function(sNamespace, aF
 		iLen = 0,
 		oFolder = null,
 		oCacheFolder = null,
+		bDisplaySpecSetting = FolderStore.displaySpecSetting(),
 		sFolderFullNameRaw = '',
 		aSubFolders = [],
 		aList = [];
@ -84,16 +86,16 @@ PromisesUserPopulator.prototype.folderResponseParseRec = function(sNamespace, aF

 			if (oCacheFolder)
 			{
-				if (!FolderStore.displaySpecSetting())
-				{
-					oCacheFolder.checkable(true);
-				}
-				else
+				if (bDisplaySpecSetting)
 				{
 					oCacheFolder.checkable(!!oFolder.Checkable);
 				}
+				else
+				{
+					oCacheFolder.checkable(true);
+				}

-				oCacheFolder.collapsed(!self.isFolderExpanded(oCacheFolder.fullNameHash));
+				oCacheFolder.collapsed(!self.isFolderExpanded(oCacheFolder.fullNameHash, expandedFolders));

 				if (oFolder.Extended)
 				{
@ -118,7 +120,7 @@ PromisesUserPopulator.prototype.folderResponseParseRec = function(sNamespace, aF
 					aSubFolders['@Collection'] && Utils.isArray(aSubFolders['@Collection']))
 				{
 					oCacheFolder.subFolders(
-						this.folderResponseParseRec(sNamespace, aSubFolders['@Collection']));
+						this.folderResponseParseRec(sNamespace, aSubFolders['@Collection'], expandedFolders));
 				}

 				aList.push(oCacheFolder);
@ -135,14 +137,16 @@ PromisesUserPopulator.prototype.foldersList = function(oData)
 		oData['@Collection'] && Utils.isArray(oData['@Collection']))
 	{
 		var
+			folderList = [],
+			expandedFolders = Local.get(Enums.ClientSideKeyName.ExpandedFolders),
 			iLimit = Utils.pInt(Settings.appSettingsGet('folderSpecLimit')),
 			iC = Utils.pInt(oData.CountRec);

 		iLimit = 100 < iLimit ? 100 : (10 > iLimit ? 10 : iLimit);

 		FolderStore.displaySpecSetting(0 >= iC || iLimit < iC);
-		FolderStore.folderList(this.folderResponseParseRec(
-			Utils.isUnd(oData.Namespace) ? '' : oData.Namespace, oData['@Collection']));
+		folderList = this.folderResponseParseRec(Utils.isUnd(oData.Namespace) ? '' : oData.Namespace, oData['@Collection'], expandedFolders);
+		FolderStore.folderList(folderList); // @todo optimization required
 	}
 };

--- a/dev/Styles/_progressjs.css
+++ b/dev/Styles/_progressjs.css
@ -0,0 +1,63 @@
+
+.progressjs-theme-rainloop {
+	z-index: 2000;
+}
+
+.progressjs-theme-rainloop .progressjs-inner {
+
+	background-color: #939595;
+	position: relative;
+	z-index: 2000;
+	height: 3px;
+	overflow: hidden;
+
+	-webkit-transition: width .5s;
+	-moz-transition: width .5s;
+	-o-transition: width .5s;
+	transition: width .5s;
+}
+
+.progressjs-theme-rainloop .progressjs-percent {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: -32px;
+	bottom: 0;
+
+	background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.3)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.3)), color-stop(0.75, rgba(255, 255, 255, 0.3)), color-stop(0.75, transparent), to(transparent));
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.3) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.3) 50%, rgba(255, 255, 255, 0.3) 75%, transparent 75%, transparent);
+	background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.3) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.3) 50%, rgba(255, 255, 255, 0.3) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.3) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.3) 50%, rgba(255, 255, 255, 0.3) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.3) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.3) 50%, rgba(255, 255, 255, 0.3) 75%, transparent 75%, transparent);
+	-webkit-background-size: 32px 32px;
+	-moz-background-size: 32px 32px;
+	-o-background-size: 32px 32px;
+	background-size: 32px 32px;
+
+	-webkit-animation: simple-pace-stripe-animation 500ms linear infinite;
+	-moz-animation: simple-pace-stripe-animation 500ms linear infinite;
+	-ms-animation: simple-pace-stripe-animation 500ms linear infinite;
+	-o-animation: simple-pace-stripe-animation 500ms linear infinite;
+	animation: simple-pace-stripe-animation 500ms linear infinite;
+}
+
+@-webkit-keyframes simple-pace-stripe-animation {
+	0% { -webkit-transform: none; transform: none; }
+	100% { -webkit-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+}
+@-moz-keyframes simple-pace-stripe-animation {
+	0% { -moz-transform: none; transform: none; }
+	100% { -moz-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+}
+@-o-keyframes simple-pace-stripe-animation {
+	0% { -o-transform: none; transform: none; }
+	100% { -o-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+}
+@-ms-keyframes simple-pace-stripe-animation {
+	0% { -ms-transform: none; transform: none; }
+	100% { -ms-transform: translate(-32px, 0); transform: translate(-32px, 0); }
+}
+@keyframes simple-pace-stripe-animation {
+	0% { transform: none; transform: none; }
+	100% { transform: translate(-32px, 0); transform: translate(-32px, 0); }
+}
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@ -265,14 +265,7 @@ function LoginUserView()

 			}, this);

-		if (Settings.appSettingsGet('rsaPublicKey') && Utils.rsaEncode.supported)
-		{
-			fLoginRequest(Utils.rsaEncode(sPassword, Settings.appSettingsGet('rsaPublicKey')));
-		}
-		else
-		{
-			fLoginRequest(sPassword);
-		}
+		fLoginRequest(sPassword);

 		return true;
 	}, function() {
--- a/dev/boot.jsx
+++ b/dev/boot.jsx
@ -2,7 +2,7 @@
 import window from 'window';

 import {Promise} from 'es6-promise-polyfill/promise.js';
-import {progressJs} from '../vendors/progress.js/src/progress.js';
+import {progressJs} from '../node_modules/Progress.js/src/progress.js';
 import {jassl} from 'jassl';

 window.jassl = jassl;
@ -13,14 +13,17 @@ window.progressJs.onbeforeend(() => {
 	const _$ = window.$;
 	if (_$)
 	{
-		_$('.progressjs-container').hide();
-		window.setTimeout(() => {
-			_$('.progressjs-container').remove();
-		}, 200); // eslint-disable-line no-magic-numbers
+		try {
+			_$('.progressjs-container').hide();
+			window.setTimeout(() => {
+				_$('.progressjs-container').remove();
+			}, 200); // eslint-disable-line no-magic-numbers
+		}
+		catch (e) {} // eslint-disable-line no-empty
 	}
 });

-require('../vendors/json2/json2.js');
+require('json3');
 require('../vendors/modernizr/modernizr-custom.js');

 require('Common/Booter.jsx');