browserify -> webpack

Code refactoring

dev/Apps/AbstractApp.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,10 +8,10 @@
 		_ = require('_'),
 		$ = require('$'),
 
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
-		Events = require('Events'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
+		Events = require('Common/Events'),
 
 		Settings = require('Storage:Settings'),
 
@@ -74,11 +74,6 @@
 		return null;
 	};
 
-	AbstractApp.prototype.setupSettings = function ()
-	{
-		return true;
-	};
-
 	/**
 	 * @param {string} sLink
 	 * @return {boolean}
@@ -270,4 +265,4 @@
 
 	module.exports = AbstractApp;
 
-}(module, require));
+}());

dev/Apps/AdminApp.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,9 +8,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data'),
@@ -44,47 +44,6 @@
 		return Data;
 	};
 
-	AdminApp.prototype.setupSettings = function ()
-	{
-		kn.addSettingsViewModel(require('Settings:Admin:General'),
-			'AdminSettingsGeneral', 'General', 'general', true);
-
-		kn.addSettingsViewModel(require('Settings:Admin:Login'),
-			'AdminSettingsLogin', 'Login', 'login');
-
-		if (Settings.capa(Enums.Capa.Prem))
-		{
-			kn.addSettingsViewModel(require('Settings:Admin:Branding'),
-				'AdminSettingsBranding', 'Branding', 'branding');
-		}
-
-		kn.addSettingsViewModel(require('Settings:Admin:Contacts'),
-			'AdminSettingsContacts', 'Contacts', 'contacts');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Domains'),
-			'AdminSettingsDomains', 'Domains', 'domains');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Security'),
-			'AdminSettingsSecurity', 'Security', 'security');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Social'),
-			'AdminSettingsSocial', 'Social', 'social');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Plugins'),
-			'AdminSettingsPlugins', 'Plugins', 'plugins');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Packages'),
-			'AdminSettingsPackages', 'Packages', 'packages');
-
-		kn.addSettingsViewModel(require('Settings:Admin:Licensing'),
-			'AdminSettingsLicensing', 'Licensing', 'licensing');
-
-		kn.addSettingsViewModel(require('Settings:Admin:About'),
-			'AdminSettingsAbout', 'About', 'about');
-
-		return true;
-	};
-
 	AdminApp.prototype.reloadDomainList = function ()
 	{
 		Data.domainsLoading(true);
@@ -311,4 +270,4 @@
 
 	module.exports = new AdminApp();
 
-}(module, require));
+}());

dev/Apps/RainLoopApp.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,13 +9,13 @@
 		$ = require('$'),
 		moment = require('moment'),
 
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Consts = require('Consts'),
-		Plugins = require('Plugins'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
-		Events = require('Events'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Consts = require('Common/Consts'),
+		Plugins = require('Common/Plugins'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
+		Events = require('Common/Events'),
 
 		kn = require('App:Knoin'),
 
@@ -114,78 +114,6 @@
 		return Data;
 	};
 
-	RainLoopApp.prototype.setupSettings = function ()
-	{
-		kn.addSettingsViewModel(require('Settings:RainLoop:General'),
-			'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
-
-		if (Settings.settingsGet('ContactsIsAllowed'))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Contacts'),
-				'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
-		}
-
-		if (Settings.capa(Enums.Capa.AdditionalAccounts))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Accounts'),
-				'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
-		}
-
-		if (Settings.capa(Enums.Capa.AdditionalIdentities))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Identities'),
-				'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
-		}
-		else
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Identity'),
-				'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
-		}
-
-		if (Settings.capa(Enums.Capa.Filters))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Filters'),
-				'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
-		}
-
-		if (Settings.capa(Enums.Capa.TwoFactor))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Security'),
-				'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
-		}
-
-		if (Settings.settingsGet('AllowGoogleSocial') ||
-			Settings.settingsGet('AllowFacebookSocial') ||
-			Settings.settingsGet('AllowTwitterSocial'))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Social'),
-				'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
-		}
-
-		if (Settings.settingsGet('ChangePasswordIsAllowed'))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:ChangePassword'),
-				'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
-		}
-
-		kn.addSettingsViewModel(require('Settings:RainLoop:Folders'),
-			'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
-
-		if (Settings.capa(Enums.Capa.Themes))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:Themes'),
-				'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
-		}
-
-		if (Settings.capa(Enums.Capa.OpenPGP))
-		{
-			kn.addSettingsViewModel(require('Settings:RainLoop:OpenPGP'),
-				'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
-		}
-
-		return true;
-	};
-
 	RainLoopApp.prototype.reloadFlagsCurrentMessageListAndMessageFromCache = function ()
 	{
 		_.each(Data.messageList(), function (oMessage) {
@@ -1372,107 +1300,112 @@
 
 			this.folders(_.bind(function (bValue) {
 
-				kn.hideLoading();
-
 				if (bValue)
 				{
-					if (window.$LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
-					{
-						window.$LAB.script(window.openpgp ? '' : LinkBuilder.openPgpJs()).wait(function () {
-							if (window.openpgp)
+					require.ensure([], function () {
+
+						kn.hideLoading();
+
+						if (window.$LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
+						{
+							window.$LAB.script(window.openpgp ? '' : LinkBuilder.openPgpJs()).wait(function () {
+								if (window.openpgp)
+								{
+									Data.openpgpKeyring = new window.openpgp.Keyring();
+									Data.capaOpenPGP(true);
+
+									Events.pub('openpgp.init');
+
+									self.reloadOpenPgpKeys();
+								}
+							});
+						}
+						else
+						{
+							Data.capaOpenPGP(false);
+						}
+
+						kn.startScreens([
+							require('Screen:RainLoop:MailBox'),
+							require('Screen:RainLoop:Settings'),
+							require('Screen:RainLoop:About')
+						]);
+
+						if (bGoogle || bFacebook || bTwitter)
+						{
+							self.socialUsers(true);
+						}
+
+						Events.sub('interval.2m', function () {
+							self.folderInformation('INBOX');
+						});
+
+						Events.sub('interval.2m', function () {
+							var sF = Data.currentFolderFullNameRaw();
+							if ('INBOX' !== sF)
 							{
-								Data.openpgpKeyring = new window.openpgp.Keyring();
-								Data.capaOpenPGP(true);
-
-								Events.pub('openpgp.init');
-
-								self.reloadOpenPgpKeys();
+								self.folderInformation(sF);
 							}
 						});
-					}
-					else
-					{
-						Data.capaOpenPGP(false);
-					}
 
-					kn.startScreens([
-						require('Screen:RainLoop:MailBox'),
-						require('Screen:RainLoop:Settings'),
-						require('Screen:RainLoop:About')
-					]);
+						Events.sub('interval.3m', function () {
+							self.folderInformationMultiply();
+						});
 
-					if (bGoogle || bFacebook || bTwitter)
-					{
-						self.socialUsers(true);
-					}
+						Events.sub('interval.5m', function () {
+							self.quota();
+						});
 
-					Events.sub('interval.2m', function () {
-						self.folderInformation('INBOX');
-					});
+						Events.sub('interval.10m', function () {
+							self.folders();
+						});
 
-					Events.sub('interval.2m', function () {
-						var sF = Data.currentFolderFullNameRaw();
-						if ('INBOX' !== sF)
+						iContactsSyncInterval = 5 <= iContactsSyncInterval ? iContactsSyncInterval : 20;
+						iContactsSyncInterval = 320 >= iContactsSyncInterval ? iContactsSyncInterval : 320;
+
+						window.setInterval(function () {
+							self.contactsSync();
+						}, iContactsSyncInterval * 60000 + 5000);
+
+						_.delay(function () {
+							self.contactsSync();
+						}, 5000);
+
+						_.delay(function () {
+							self.folderInformationMultiply(true);
+						}, 500);
+
+						Plugins.runHook('rl-start-user-screens');
+						Events.pub('rl.bootstart-user-screens');
+
+						if (!!Settings.settingsGet('AccountSignMe') && window.navigator.registerProtocolHandler)
 						{
-							self.folderInformation(sF);
+							_.delay(function () {
+								try {
+									window.navigator.registerProtocolHandler('mailto',
+										window.location.protocol + '//' + window.location.host + window.location.pathname + '?mailto&to=%s',
+										'' + (Settings.settingsGet('Title') || 'RainLoop'));
+								} catch(e) {}
+
+								if (Settings.settingsGet('MailToEmail'))
+								{
+									Utils.mailToHelper(Settings.settingsGet('MailToEmail'), require('View:Popup:Compose'));
+								}
+							}, 500);
+						}
+
+						if (!Globals.bMobileDevice)
+						{
+							_.defer(function () {
+								self.initLayoutResizer('#rl-left', '#rl-right', Enums.ClientSideKeyName.FolderListSize);
+							});
 						}
 					});
-
-					Events.sub('interval.3m', function () {
-						self.folderInformationMultiply();
-					});
-
-					Events.sub('interval.5m', function () {
-						self.quota();
-					});
-
-					Events.sub('interval.10m', function () {
-						self.folders();
-					});
-
-					iContactsSyncInterval = 5 <= iContactsSyncInterval ? iContactsSyncInterval : 20;
-					iContactsSyncInterval = 320 >= iContactsSyncInterval ? iContactsSyncInterval : 320;
-
-					window.setInterval(function () {
-						self.contactsSync();
-					}, iContactsSyncInterval * 60000 + 5000);
-
-					_.delay(function () {
-						self.contactsSync();
-					}, 5000);
-
-					_.delay(function () {
-						self.folderInformationMultiply(true);
-					}, 500);
-
-					Plugins.runHook('rl-start-user-screens');
-					Events.pub('rl.bootstart-user-screens');
-
-					if (!!Settings.settingsGet('AccountSignMe') && window.navigator.registerProtocolHandler)
-					{
-						_.delay(function () {
-							try {
-								window.navigator.registerProtocolHandler('mailto',
-									window.location.protocol + '//' + window.location.host + window.location.pathname + '?mailto&to=%s',
-									'' + (Settings.settingsGet('Title') || 'RainLoop'));
-							} catch(e) {}
-
-							if (Settings.settingsGet('MailToEmail'))
-							{
-								Utils.mailToHelper(Settings.settingsGet('MailToEmail'), require('View:Popup:Compose'));
-							}
-						}, 500);
-					}
-
-					if (!Globals.bMobileDevice)
-					{
-						_.defer(function () {
-							self.initLayoutResizer('#rl-left', '#rl-right', Enums.ClientSideKeyName.FolderListSize);
-						});
-					}
 				}
 				else
 				{
+					kn.hideLoading();
+
 					self.bootstartLoginScreen();
 				}
 
@@ -1527,4 +1460,4 @@
 
 	module.exports = new RainLoopApp();
 
-}(module, require));
+}());

dev/Boot.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -10,18 +10,16 @@
 			_ = require('_'),
 			$ = require('$'),
 
-			Globals = require('Globals'),
-			Plugins = require('Plugins'),
-			Utils = require('Utils'),
-			Enums = require('Enums'),
+			Globals = require('Common/Globals'),
+			Plugins = require('Common/Plugins'),
+			Utils = require('Common/Utils'),
+			Enums = require('Common/Enums'),
 
 			EmailModel = require('Model:Email')
 		;
 
 		Globals.__APP = App;
 
-		App.setupSettings();
-
 		Plugins.__boot = App;
 		Plugins.__remote = App.remote();
 		Plugins.__data = App.data();
@@ -76,4 +74,4 @@
 
 	};
 
-}(module, require));
+}());

dev/Common/Base64.js

@@ -1,7 +1,7 @@
 // Base64 encode / decode
 // http://www.webtoolkit.info/
 
-(function (module) {
+(function () {
 
 	'use strict';
 
@@ -168,4 +168,4 @@
 	module.exports = Base64;
 	/*jslint bitwise: false*/
 
-}(module, require));
+}());

dev/Common/Consts.js

@@ -1,5 +1,5 @@
 
-(function (module) {
+(function () {
 
 	'use strict';
 

dev/Common/Enums.js

@@ -1,5 +1,5 @@
 
-(function (module) {
+(function () {
 
 	'use strict';
 
@@ -427,4 +427,4 @@
 
 	module.exports = Enums;
 
-}(module, require));
+}());

dev/Common/Events.js

@@ -1,13 +1,13 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Utils = require('Utils'),
-		Plugins = require('Plugins')
+		Utils = require('Common/Utils'),
+		Plugins = require('Common/Plugins')
 	;
 
 	/**
@@ -62,4 +62,4 @@
 
 	module.exports = new Events();
 
-}(module, require));
+}());

dev/Common/Globals.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -12,7 +12,7 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Enums = require('Enums')
+		Enums = require('Common/Enums')
 	;
 
 	Globals.$win = $(window);
@@ -284,4 +284,4 @@
 
 	module.exports = Globals;
 
-}(module, require));
+}());

dev/Common/HtmlEditor.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,7 +7,7 @@
 		window = require('window'),
 		_ = require('_'),
 
-		Globals = require('Globals'),
+		Globals = require('Common/Globals'),
 		Settings = require('Storage:Settings')
 	;
 
@@ -272,4 +272,4 @@
 
 	module.exports = HtmlEditor;
 
-}(module, require));
+}());

dev/Common/LinkBuilder.js

@@ -1,11 +1,10 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
-		window = require('window'),
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -95,7 +94,7 @@
 	 */
 	LinkBuilder.prototype.change = function (sEmail)
 	{
-		return this.sServer + '/Change/' + this.sSpecSuffix + '/' + window.encodeURIComponent(sEmail) + '/';
+		return this.sServer + '/Change/' + this.sSpecSuffix + '/' + Utils.encodeURIComponent(sEmail) + '/';
 	};
 
 	/**
@@ -131,7 +130,7 @@
 	 */
 	LinkBuilder.prototype.avatarLink = function (sEmail)
 	{
-		return this.sServer + '/Raw/0/Avatar/' + window.encodeURIComponent(sEmail) + '/';
+		return this.sServer + '/Raw/0/Avatar/' + Utils.encodeURIComponent(sEmail) + '/';
 	};
 
 	/**
@@ -304,7 +303,7 @@
 	 */
 	LinkBuilder.prototype.openPgpJs = function ()
 	{
-		return  this.sStaticPrefix + 'js/openpgp.min.js';
+		return  this.sStaticPrefix + 'js/min/openpgp.js';
 	};
 
 	/**
@@ -333,4 +332,4 @@
 
 	module.exports = new LinkBuilder();
 
-}(module, require));
+}());

dev/Common/Plugins.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -110,4 +110,4 @@
 
 	module.exports = new Plugins();
 
-}(module, require));
+}());

dev/Common/Selector.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,8 +9,8 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils')
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -726,4 +726,4 @@
 
 	module.exports = Selector;
 
-}(module, require));
+}());

dev/Common/Utils.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -11,9 +11,9 @@
 		$ = require('$'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Consts = require('Consts'),
-		Globals = require('Globals')
+		Enums = require('Common/Enums'),
+		Consts = require('Common/Consts'),
+		Globals = require('Common/Globals')
 	;
 
 	Utils.trim = $.trim;
@@ -80,6 +80,15 @@
 		return Utils.isNormal(mValue) ? '' + mValue : '';
 	};
 
+	/**
+	 * @param {string} sComponent
+	 * @return {string}
+	 */
+	Utils.encodeURIComponent = function (sComponent)
+	{
+		return window.encodeURIComponent(sComponent);
+	};
+
 	/**
 	 * @param {*} aValue
 	 * @return {boolean}
@@ -1929,4 +1938,4 @@
 
 	module.exports = Utils;
 
-}(module, require));
+}());

dev/External/JSON.js

@@ -1 +0,0 @@
-module.exports = JSON;

dev/External/Jua.js

@@ -1 +0,0 @@
-module.exports = Jua;

dev/External/crossroads.js

@@ -1 +0,0 @@
-module.exports = crossroads;

dev/External/hasher.js

@@ -1 +0,0 @@
-module.exports = hasher;

dev/External/ifvisible.js

@@ -1 +0,0 @@
-module.exports = ifvisible;

dev/External/jquery.js

@@ -1 +0,0 @@
-module.exports = $;

dev/External/key.js

@@ -1 +0,0 @@
-module.exports = key;

dev/External/ko.js

@@ -13,8 +13,8 @@
 		'init': function (oElement, fValueAccessor) {
 
 			var
-				Globals = require('Globals'),
-				Utils = require('Utils')
+				Globals = require('Common/Globals'),
+				Utils = require('Common/Utils')
 			;
 
 			if (!Globals.bMobileDevice)
@@ -52,7 +52,7 @@
 	ko.bindingHandlers.tooltip2 = {
 		'init': function (oElement, fValueAccessor) {
 			var
-				Globals = require('Globals'),
+				Globals = require('Common/Globals'),
 				$oEl = $(oElement),
 				sClass = $oEl.data('tooltip-class') || '',
 				sPlacement = $oEl.data('tooltip-placement') || 'top'
@@ -85,7 +85,7 @@
 
 			var
 				$oEl = $(oElement),
-				Globals = require('Globals')
+				Globals = require('Common/Globals')
 			;
 
 			$oEl.tooltip({
@@ -119,7 +119,7 @@
 
 	ko.bindingHandlers.registrateBootstrapDropdown = {
 		'init': function (oElement) {
-			var Globals = require('Globals');
+			var Globals = require('Common/Globals');
 			Globals.aBootstrapDropdowns.push($(oElement));
 		}
 	};
@@ -130,7 +130,7 @@
 			{
 				var
 					$el = $(oElement),
-					Utils = require('Utils')
+					Utils = require('Common/Utils')
 				;
 
 				if (!$el.hasClass('open'))
@@ -160,7 +160,7 @@
 
 	ko.bindingHandlers.csstext = {
 		'init': function (oElement, fValueAccessor) {
-			var Utils = require('Utils');
+			var Utils = require('Common/Utils');
 			if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText))
 			{
 				oElement.styleSheet.cssText = ko.utils.unwrapObservable(fValueAccessor());
@@ -171,7 +171,7 @@
 			}
 		},
 		'update': function (oElement, fValueAccessor) {
-			var Utils = require('Utils');
+			var Utils = require('Common/Utils');
 			if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText))
 			{
 				oElement.styleSheet.cssText = ko.utils.unwrapObservable(fValueAccessor());
@@ -239,8 +239,8 @@
 		'init': function (oElement, fValueAccessor) {
 
 			var
-				Globals = require('Globals'),
-				Utils = require('Utils')
+				Globals = require('Common/Globals'),
+				Utils = require('Common/Utils')
 			;
 
 			$(oElement).toggleClass('fade', !Globals.bMobileDevice).modal({
@@ -262,14 +262,14 @@
 
 	ko.bindingHandlers.i18nInit = {
 		'init': function (oElement) {
-			var Utils = require('Utils');
+			var Utils = require('Common/Utils');
 			Utils.i18nToNode(oElement);
 		}
 	};
 
 	ko.bindingHandlers.i18nUpdate = {
 		'update': function (oElement, fValueAccessor) {
-			var Utils = require('Utils');
+			var Utils = require('Common/Utils');
 			ko.utils.unwrapObservable(fValueAccessor());
 			Utils.i18nToNode(oElement);
 		}
@@ -310,8 +310,8 @@
 		'update': function (oElement, fValueAccessor) {
 
 			var
-				Utils = require('Utils'),
-				Globals = require('Globals'),
+				Utils = require('Common/Utils'),
+				Globals = require('Common/Globals'),
 				aValues = ko.utils.unwrapObservable(fValueAccessor()),
 				iValue = Utils.pInt(aValues[1]),
 				iSize = 0,
@@ -345,8 +345,8 @@
 	ko.bindingHandlers.draggable = {
 		'init': function (oElement, fValueAccessor, fAllBindingsAccessor) {
 			var
-				Globals = require('Globals'),
-				Utils = require('Utils')
+				Globals = require('Common/Globals'),
+				Utils = require('Common/Utils')
 			;
 			if (!Globals.bMobileDevice)
 			{
@@ -428,7 +428,7 @@
 
 	ko.bindingHandlers.droppable = {
 		'init': function (oElement, fValueAccessor, fAllBindingsAccessor) {
-			var Globals = require('Globals');
+			var Globals = require('Common/Globals');
 			if (!Globals.bMobileDevice)
 			{
 				var
@@ -470,7 +470,7 @@
 
 	ko.bindingHandlers.nano = {
 		'init': function (oElement) {
-			var Globals = require('Globals');
+			var Globals = require('Common/Globals');
 			if (!Globals.bDisableNanoScroll)
 			{
 				$(oElement)
@@ -567,7 +567,7 @@
 		'init': function(oElement, fValueAccessor, fAllBindingsAccessor) {
 
 			var
-				Utils = require('Utils'),
+				Utils = require('Common/Utils'),
 				EmailModel = require('Model:Email'),
 
 				$oEl = $(oElement),
@@ -641,7 +641,7 @@
 		'init': function(oElement, fValueAccessor, fAllBindingsAccessor) {
 
 			var
-				Utils = require('Utils'),
+				Utils = require('Common/Utils'),
 				ContactTagModel = require('Model:ContactTag'),
 
 				$oEl = $(oElement),
@@ -756,7 +756,7 @@
 	ko.extenders.trimmer = function (oTarget)
 	{
 		var
-			Utils = require('Utils'),
+			Utils = require('Common/Utils'),
 			oResult = ko.computed({
 				'read': oTarget,
 				'write': function (sNewValue) {
@@ -773,7 +773,7 @@
 	ko.extenders.posInterer = function (oTarget, iDefault)
 	{
 		var
-			Utils = require('Utils'),
+			Utils = require('Common/Utils'),
 			oResult = ko.computed({
 				'read': oTarget,
 				'write': function (sNewValue) {
@@ -829,7 +829,7 @@
 
 	ko.extenders.falseTimeout = function (oTarget, iOption)
 	{
-		var Utils = require('Utils');
+		var Utils = require('Common/Utils');
 
 		oTarget.iTimeout = 0;
 		oTarget.subscribe(function (bValue) {
@@ -854,7 +854,7 @@
 
 	ko.observable.fn.validateEmail = function ()
 	{
-		var Utils = require('Utils');
+		var Utils = require('Common/Utils');
 
 		this.hasError = ko.observable(false);
 
@@ -869,7 +869,7 @@
 
 	ko.observable.fn.validateSimpleEmail = function ()
 	{
-		var Utils = require('Utils');
+		var Utils = require('Common/Utils');
 
 		this.hasError = ko.observable(false);
 
@@ -884,7 +884,7 @@
 
 	ko.observable.fn.validateFunc = function (fFunc)
 	{
-		var Utils = require('Utils');
+		var Utils = require('Common/Utils');
 
 		this.hasFuncError = ko.observable(false);
 

dev/External/moment.js

@@ -1 +0,0 @@
-module.exports = moment;

dev/External/ssm.js

@@ -1 +0,0 @@
-module.exports = ssm;

dev/External/underscore.js

@@ -1 +0,0 @@
-module.exports = _;

dev/External/window.js

@@ -1 +0,0 @@
-module.exports = window;

dev/Knoin/Knoin.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -10,9 +10,9 @@
 		hasher = require('hasher'),
 		crossroads = require('crossroads'),
 
-		Globals = require('Globals'),
-		Plugins = require('Plugins'),
-		Utils = require('Utils')
+		Globals = require('Common/Globals'),
+		Plugins = require('Common/Plugins'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -458,4 +458,4 @@
 
 	module.exports = new Knoin();
 
-}(module, require));
+}());

dev/Knoin/KnoinAbstractBoot.js

@@ -1,5 +1,5 @@
 
-(function (module) {
+(function () {
 
 	'use strict';
 
@@ -18,4 +18,4 @@
 
 	module.exports = KnoinAbstractBoot;
 
-}(module, require));
+}());

dev/Knoin/KnoinAbstractScreen.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,7 +7,7 @@
 		_ = require('_'),
 		crossroads = require('crossroads'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -88,4 +88,4 @@
 
 	module.exports = KnoinAbstractScreen;
 
-}(module, require));
+}());

dev/Knoin/KnoinAbstractViewModel.js

@@ -1,14 +1,14 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		Globals = require('Globals')
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		Globals = require('Common/Globals')
 	;
 
 	/**
@@ -127,4 +127,4 @@
 
 	module.exports = KnoinAbstractViewModel;
 
-}(module, require));
+}());

dev/Models/AccountModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -33,9 +33,9 @@
 	 */
 	AccountModel.prototype.changeAccountLink = function ()
 	{
-		return require('LinkBuilder').change(this.email);
+		return require('Common/LinkBuilder').change(this.email);
 	};
 
 	module.exports = AccountModel;
 
-}(module, require));
+}());

dev/Models/AttachmentModel.js

@@ -1,14 +1,14 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		window = require('window'),
 
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder')
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder')
 	;
 
 	/**
@@ -249,4 +249,4 @@
 
 	module.exports = AttachmentModel;
 
-}(module, require));
+}());

dev/Models/ComposeAttachmentModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -73,4 +73,4 @@
 
 	module.exports = ComposeAttachmentModel;
 
-}(module, require));
+}());

dev/Models/ContactModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,9 +7,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder')
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder')
 	;
 
 	/**
@@ -138,4 +138,4 @@
 
 	module.exports = ContactModel;
 
-}(module, require));
+}());

dev/Models/ContactPropertyModel.js

@@ -1,13 +1,13 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils')
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -39,4 +39,4 @@
 
 	module.exports = ContactPropertyModel;
 
-}(module, require));
+}());

dev/Models/ContactTagModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -55,4 +55,4 @@
 
 	module.exports = ContactTagModel;
 
-}(module, require));
+}());

dev/Models/EmailModel.js

@@ -1,10 +1,10 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -345,4 +345,4 @@
 
 	module.exports = EmailModel;
 
-}(module, require));
+}());

dev/Models/FilterConditionModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums')
+		Enums = require('Common/Enums')
 	;
 
 	/**
@@ -59,4 +59,4 @@
 
 	module.exports = FilterConditionModel;
 
-}(module, require));
+}());

dev/Models/FilterModel.js

@@ -1,13 +1,13 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 		FilterConditionModel = require('Model:FilterCondition')
 	;
 
@@ -91,4 +91,4 @@
 
 	module.exports = FilterModel;
 
-}(module, require));
+}());

dev/Models/FolderModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,10 +7,10 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		Events = require('Events')
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		Events = require('Common/Events')
 	;
 
 	/**
@@ -350,4 +350,4 @@
 
 	module.exports = FolderModel;
 
-}(module, require));
+}());

dev/Models/IdentityModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -47,4 +47,4 @@
 
 	module.exports = IdentityModel;
 
-}(module, require));
+}());

dev/Models/MessageModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -10,10 +10,10 @@
 		ko = require('ko'),
 		moment = require('moment'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		Globals = require('Globals'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		Globals = require('Common/Globals'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		EmailModel = require('Model:Email'),
 		AttachmentModel = require('Model:Attachment')
@@ -1291,4 +1291,4 @@
 
 	module.exports = MessageModel;
 
-}(module, require));
+}());

dev/Models/OpenPgpKeyModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -40,4 +40,4 @@
 
 	module.exports = OpenPgpKeyModel;
 
-}(module, require));
+}());

dev/Screens/AboutScreen.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -29,4 +29,4 @@
 
 	module.exports = AboutScreen;
 
-}(module, require));
+}());

dev/Screens/AbstractSettingsScreen.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,9 +8,9 @@
 		$ = require('$'),
 		ko = require('ko'),
 
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		kn = require('App:Knoin'),
 		KnoinAbstractScreen = require('Knoin:AbstractScreen')
@@ -29,10 +29,23 @@
 
 		this.oCurrentSubScreen = null;
 		this.oViewModelPlace = null;
+
+		this.setupSettings();
 	}
 
 	_.extend(AbstractSettingsScreen.prototype, KnoinAbstractScreen.prototype);
 
+	/**
+	 * @param {Function=} fCallback
+	 */
+	AbstractSettingsScreen.prototype.setupSettings = function (fCallback)
+	{
+		if (fCallback)
+		{
+			fCallback();
+		}
+	};
+
 	AbstractSettingsScreen.prototype.onRoute = function (sSubName)
 	{
 		var
@@ -196,4 +209,4 @@
 
 	module.exports = AbstractSettingsScreen;
 
-}(module, require));
+}());

dev/Screens/AdminLoginScreen.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -29,4 +29,4 @@
 
 	module.exports = AdminLoginScreen;
 
-}(module, require));
+}());

dev/Screens/AdminSettingsScreen.js

@@ -1,11 +1,13 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
+		kn = require('App:Knoin'),
+
 		AbstractSettings = require('Screen:AbstractSettings')
 	;
 
@@ -23,6 +25,50 @@
 
 	_.extend(AdminSettingsScreen.prototype, AbstractSettings.prototype);
 
+	/**
+	 * @param {Function=} fCallback
+	 */
+	AdminSettingsScreen.prototype.setupSettings = function (fCallback)
+	{
+		kn.addSettingsViewModel(require('Settings:Admin:General'),
+			'AdminSettingsGeneral', 'General', 'general', true);
+
+		kn.addSettingsViewModel(require('Settings:Admin:Login'),
+			'AdminSettingsLogin', 'Login', 'login');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Branding'),
+			'AdminSettingsBranding', 'Branding', 'branding');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Contacts'),
+			'AdminSettingsContacts', 'Contacts', 'contacts');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Domains'),
+			'AdminSettingsDomains', 'Domains', 'domains');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Security'),
+			'AdminSettingsSecurity', 'Security', 'security');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Social'),
+			'AdminSettingsSocial', 'Social', 'social');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Plugins'),
+			'AdminSettingsPlugins', 'Plugins', 'plugins');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Packages'),
+			'AdminSettingsPackages', 'Packages', 'packages');
+
+		kn.addSettingsViewModel(require('Settings:Admin:Licensing'),
+			'AdminSettingsLicensing', 'Licensing', 'licensing');
+
+		kn.addSettingsViewModel(require('Settings:Admin:About'),
+			'AdminSettingsAbout', 'About', 'about');
+
+		if (fCallback)
+		{
+			fCallback();
+		}
+	};
+
 	AdminSettingsScreen.prototype.onShow = function ()
 	{
 		require('App:Admin').setTitle('');
@@ -30,4 +76,4 @@
 
 	module.exports = AdminSettingsScreen;
 
-}(module, require));
+}());

dev/Screens/LoginScreen.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -29,4 +29,4 @@
 
 	module.exports = LoginScreen;
 
-}(module, require));
+}());

dev/Screens/MailBoxScreen.js

@@ -1,15 +1,15 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		Events = require('Events'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		Events = require('Common/Events'),
 
 		KnoinAbstractScreen = require('Knoin:AbstractScreen'),
 
@@ -193,4 +193,4 @@
 
 	module.exports = MailBoxScreen;
 
-}(module, require));
+}());

dev/Screens/SettingsScreen.js

@@ -1,14 +1,18 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		Globals = require('Globals'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		Globals = require('Common/Globals'),
+
+		Settings = require('Storage:Settings'),
+
+		kn = require('App:Knoin'),
 
 		AbstractSettingsScreen = require('Screen:AbstractSettings')
 	;
@@ -34,6 +38,84 @@
 
 	_.extend(SettingsScreen.prototype, AbstractSettingsScreen.prototype);
 
+	/**
+	 * @param {Function=} fCallback
+	 */
+	SettingsScreen.prototype.setupSettings = function (fCallback)
+	{
+		kn.addSettingsViewModel(require('Settings:RainLoop:General'),
+			'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
+
+		if (Settings.settingsGet('ContactsIsAllowed'))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Contacts'),
+				'SettingsContacts', 'SETTINGS_LABELS/LABEL_CONTACTS_NAME', 'contacts');
+		}
+
+		if (Settings.capa(Enums.Capa.AdditionalAccounts))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Accounts'),
+				'SettingsAccounts', 'SETTINGS_LABELS/LABEL_ACCOUNTS_NAME', 'accounts');
+		}
+
+		if (Settings.capa(Enums.Capa.AdditionalIdentities))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Identities'),
+				'SettingsIdentities', 'SETTINGS_LABELS/LABEL_IDENTITIES_NAME', 'identities');
+		}
+		else
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Identity'),
+				'SettingsIdentity', 'SETTINGS_LABELS/LABEL_IDENTITY_NAME', 'identity');
+		}
+
+		if (Settings.capa(Enums.Capa.Filters))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Filters'),
+				'SettingsFilters', 'SETTINGS_LABELS/LABEL_FILTERS_NAME', 'filters');
+		}
+
+		if (Settings.capa(Enums.Capa.TwoFactor))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Security'),
+				'SettingsSecurity', 'SETTINGS_LABELS/LABEL_SECURITY_NAME', 'security');
+		}
+
+		if (Settings.settingsGet('AllowGoogleSocial') ||
+			Settings.settingsGet('AllowFacebookSocial') ||
+			Settings.settingsGet('AllowTwitterSocial'))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Social'),
+				'SettingsSocial', 'SETTINGS_LABELS/LABEL_SOCIAL_NAME', 'social');
+		}
+
+		if (Settings.settingsGet('ChangePasswordIsAllowed'))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:ChangePassword'),
+				'SettingsChangePassword', 'SETTINGS_LABELS/LABEL_CHANGE_PASSWORD_NAME', 'change-password');
+		}
+
+		kn.addSettingsViewModel(require('Settings:RainLoop:Folders'),
+			'SettingsFolders', 'SETTINGS_LABELS/LABEL_FOLDERS_NAME', 'folders');
+
+		if (Settings.capa(Enums.Capa.Themes))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:Themes'),
+				'SettingsThemes', 'SETTINGS_LABELS/LABEL_THEMES_NAME', 'themes');
+		}
+
+		if (Settings.capa(Enums.Capa.OpenPGP))
+		{
+			kn.addSettingsViewModel(require('Settings:RainLoop:OpenPGP'),
+				'SettingsOpenPGP', 'SETTINGS_LABELS/LABEL_OPEN_PGP_NAME', 'openpgp');
+		}
+
+		if (fCallback)
+		{
+			fCallback();
+		}
+	};
+
 	SettingsScreen.prototype.onShow = function ()
 	{
 		this.setSettingsTitle();
@@ -47,4 +129,4 @@
 
 	module.exports = SettingsScreen;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsAbout.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -85,4 +85,4 @@
 
 	module.exports = AdminSettingsAbout;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsBranding.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,7 +7,7 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -16,7 +16,7 @@
 	function AdminSettingsBranding()
 	{
 		var
-			Enums = require('Enums'),
+			Enums = require('Common/Enums'),
 			Settings = require('Storage:Settings')
 		;
 
@@ -88,4 +88,4 @@
 
 	module.exports = AdminSettingsBranding;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsContacts.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings')
 	;
@@ -239,4 +239,4 @@
 
 	module.exports = AdminSettingsContacts;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsDomains.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,7 +8,7 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
+		Enums = require('Common/Enums'),
 
 		PopupsDomainViewModel = require('View:Popup:Domain'),
 
@@ -103,4 +103,4 @@
 
 	module.exports = AdminSettingsDomains;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsGeneral.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,9 +7,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data')
@@ -142,4 +142,4 @@
 
 	module.exports = AdminSettingsGeneral;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsLicensing.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -67,4 +67,4 @@
 
 	module.exports = AdminSettingsLicensing;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsLogin.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data')
@@ -68,4 +68,4 @@
 
 	module.exports = AdminSettingsLogin;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsPackages.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		window = require('window'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Data = require('Storage:Admin:Data'),
 		Remote = require('Storage:Admin:Remote')
@@ -110,4 +110,4 @@
 
 	module.exports = AdminSettingsPackages;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsPlugins.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data'),
@@ -110,4 +110,4 @@
 
 	module.exports = AdminSettingsPlugins;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsSecurity.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,9 +7,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data'),
@@ -133,4 +133,4 @@
 
 	module.exports = AdminSettingsSecurity;
 
-}(module, require));
+}());

dev/Settings/Admin/AdminSettingsSocial.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils')
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -150,4 +150,4 @@
 
 	module.exports = AdminSettingsSocial;
 
-}(module, require));
+}());

dev/Settings/App/SettingsAccounts.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,9 +8,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Data = require('Storage:RainLoop:Data'),
 		Remote = require('Storage:RainLoop:Remote')
@@ -96,4 +96,4 @@
 
 	module.exports = SettingsAccounts;
 
-}(module, require));
+}());

dev/Settings/App/SettingsChangePassword.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Remote = require('Storage:RainLoop:Remote')
 	;
@@ -118,4 +118,4 @@
 
 	module.exports = SettingsChangePassword;
 
-}(module, require));
+}());

dev/Settings/App/SettingsContacts.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils'),
+		Utils = require('Common/Utils'),
 
 		Remote = require('Storage:RainLoop:Remote'),
 		Data = require('Storage:RainLoop:Data')
@@ -55,4 +55,4 @@
 
 	module.exports = SettingsContacts;
 
-}(module, require));
+}());

dev/Settings/App/SettingsFilters.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -39,4 +39,4 @@
 
 	module.exports = SettingsFilters;
 
-}(module, require));
+}());

dev/Settings/App/SettingsFolders.js

@@ -1,13 +1,13 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:RainLoop:Data'),
@@ -211,4 +211,4 @@
 
 	module.exports = SettingsFolders;
 
-}(module, require));
+}());

dev/Settings/App/SettingsGeneral.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,11 +8,11 @@
 		$ = require('$'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Consts = require('Consts'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Consts = require('Common/Consts'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Data = require('Storage:RainLoop:Data'),
 		Remote = require('Storage:RainLoop:Remote')
@@ -175,4 +175,4 @@
 
 	module.exports = SettingsGeneral;
 
-}(module, require));
+}());

dev/Settings/App/SettingsIdentities.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,9 +7,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		HtmlEditor = require('HtmlEditor'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		HtmlEditor = require('Common/HtmlEditor'),
 
 		Data = require('Storage:RainLoop:Data'),
 		Remote = require('Storage:RainLoop:Remote')
@@ -230,4 +230,4 @@
 
 	module.exports = SettingsIdentities;
 
-}(module, require));
+}());

dev/Settings/App/SettingsIdentity.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,9 +7,9 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		HtmlEditor = require('HtmlEditor'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		HtmlEditor = require('Common/HtmlEditor'),
 
 		Data = require('Storage:RainLoop:Data'),
 		Remote = require('Storage:RainLoop:Remote')
@@ -100,4 +100,4 @@
 
 	module.exports = SettingsIdentity;
 
-}(module, require));
+}());

dev/Settings/App/SettingsOpenPGP.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -80,4 +80,4 @@
 
 	module.exports = SettingsOpenPGP;
 
-}(module, require));
+}());

dev/Settings/App/SettingsSecurity.js

@@ -1,14 +1,14 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
 
 		Remote = require('Storage:RainLoop:Remote')
 	;
@@ -163,4 +163,4 @@
 
 	module.exports = SettingsSecurity;
 
-}(module, require));
+}());

dev/Settings/App/SettingsSocial.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,7 +9,7 @@
 	function SettingsSocial()
 	{
 		var
-			Utils = require('Utils'),
+			Utils = require('Common/Utils'),
 			Data = require('Storage:RainLoop:Data')
 		;
 
@@ -73,4 +73,4 @@
 
 	module.exports = SettingsSocial;
 
-}(module, require));
+}());

dev/Settings/App/SettingsThemes.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,9 +9,9 @@
 		$ = require('$'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Data = require('Storage:RainLoop:Data'),
 		Remote = require('Storage:RainLoop:Remote')
@@ -129,4 +129,4 @@
 
 	module.exports = SettingsThemes;
 
-}(module, require));
+}());

dev/Storages/AbstractData.js

@@ -1,12 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings')
 	;
@@ -90,4 +90,4 @@
 
 	module.exports = AbstractData;
 
-}(module, require));
+}());

dev/Storages/AbstractRemoteStorage.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,12 +9,12 @@
 		_ = require('_'),
 		$ = require('$'),
 
-		Consts = require('Consts'),
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		Plugins = require('Plugins'),
-		LinkBuilder = require('LinkBuilder'),
+		Consts = require('Common/Consts'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		Plugins = require('Common/Plugins'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings')
 	;
@@ -309,4 +309,4 @@
 
 	module.exports = AbstractRemoteStorage;
 
-}(module, require));
+}());

dev/Storages/AdminDataStorage.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -65,4 +65,4 @@
 
 	module.exports = new AdminDataStorage();
 
-}(module, require));
+}());

dev/Storages/AdminRemoteStorage.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 	
 	'use strict';
 
@@ -273,4 +273,4 @@
 
 	module.exports = new AdminRemoteStorage();
 
-}(module, require));
+}());

dev/Storages/CacheStorage.js

@@ -1,15 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings')
 	;
@@ -346,4 +346,4 @@
 
 	module.exports = new CacheStorage();
 
-}(module, require));
+}());

dev/Storages/DataStorage.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -11,11 +11,11 @@
 		ko = require('ko'),
 		moment = require('moment'),
 
-		Consts = require('Consts'),
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Consts = require('Common/Consts'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Cache = require('Storage:RainLoop:Cache'),
@@ -1061,4 +1061,4 @@
 
 	module.exports = new DataStorage();
 
-}(module, require));
+}());

dev/Storages/LocalStorage.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -52,4 +52,4 @@
 
 	module.exports = new LocalStorage();
 
-}(module, require));
+}());

dev/Storages/LocalStorages/CookieDriver.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,8 +8,8 @@
 		$ = require('$'),
 		JSON = require('JSON'),
 
-		Consts = require('Consts'),
-		Utils = require('Utils')
+		Consts = require('Common/Consts'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -97,4 +97,4 @@
 
 	module.exports = CookieDriver;
 
-}(module, require));
+}());

dev/Storages/LocalStorages/LocalStorageDriver.js

@@ -1,6 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,8 +8,8 @@
 		window = require('window'),
 		JSON = require('JSON'),
 
-		Consts = require('Consts'),
-		Utils = require('Utils')
+		Consts = require('Common/Consts'),
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -95,4 +95,4 @@
 
 	module.exports = LocalStorageDriver;
 
-}(module, require));
+}());

dev/Storages/RemoteStorage.js

@@ -1,16 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 
-		Utils = require('Utils'),
-		Consts = require('Consts'),
-		Globals = require('Globals'),
-		Base64 = require('Base64'),
+		Utils = require('Common/Utils'),
+		Consts = require('Common/Consts'),
+		Globals = require('Common/Globals'),
+		Base64 = require('Common/Base64'),
 
 		Settings = require('Storage:Settings'),
 		Cache = require('Storage:RainLoop:Cache'),
@@ -811,4 +811,4 @@
 
 	module.exports = new RemoteStorage();
 
-}(module, require));
+}());

dev/Storages/SettingsStorage.js

@@ -1,13 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		window = require('window'),
 		
-		Utils = require('Utils')
+		Utils = require('Common/Utils')
 	;
 
 	/**
@@ -52,4 +52,4 @@
 
 	module.exports = new SettingsStorage();
 
-}(module, require));
+}());

dev/ViewModels/AboutViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -31,4 +31,4 @@
 
 	module.exports = AboutViewModel;
 
-}(module, require));
+}());

dev/ViewModels/AbstractSystemDropDownViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,9 +9,9 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:RainLoop:Data'),
@@ -117,4 +117,4 @@
 
 	module.exports = AbstractSystemDropDownViewModel;
 
-}(module, require));
+}());

dev/ViewModels/AdminLoginViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Remote = require('Storage:Admin:Remote'),
 
@@ -118,4 +118,4 @@
 
 	module.exports = AdminLoginViewModel;
 
-}(module, require));
+}());

dev/ViewModels/AdminSettingsMenuViewModel.js

@@ -1,12 +1,12 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
 	var
 		_ = require('_'),
 		
-		Globals = require('Globals'),
+		Globals = require('Common/Globals'),
 
 		kn = require('App:Knoin'),
 		KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
@@ -39,4 +39,4 @@
 
 	module.exports = AdminSettingsMenuViewModel;
 
-}(module, require));
+}());

dev/ViewModels/AdminSettingsPaneViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -43,4 +43,4 @@
 
 	module.exports = AdminSettingsPaneViewModel;
 
-}(module, require));
+}());

dev/ViewModels/LoginViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,9 +9,9 @@
 		$ = require('$'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:RainLoop:Data'),
@@ -367,4 +367,4 @@
 
 	module.exports = LoginViewModel;
 
-}(module, require));
+}());

dev/ViewModels/MailBoxFolderListViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -10,10 +10,10 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Utils = require('Utils'),
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		LinkBuilder = require('LinkBuilder'),
+		Utils = require('Common/Utils'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		LinkBuilder = require('Common/LinkBuilder'),
 
 		Settings = require('Storage:Settings'),
 		Cache = require('Storage:RainLoop:Cache'),
@@ -271,4 +271,4 @@
 
 	module.exports = MailBoxFolderListViewModel;
 
-}(module, require));
+}());

dev/ViewModels/MailBoxMessageListViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -11,13 +11,13 @@
 		Jua = require('Jua'),
 		ifvisible = require('ifvisible'),
 
-		Enums = require('Enums'),
-		Consts = require('Consts'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		LinkBuilder = require('LinkBuilder'),
-		Events = require('Events'),
-		Selector = require('Selector'),
+		Enums = require('Common/Enums'),
+		Consts = require('Common/Consts'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		LinkBuilder = require('Common/LinkBuilder'),
+		Events = require('Common/Events'),
+		Selector = require('Common/Selector'),
 
 		Settings = require('Storage:Settings'),
 		Cache = require('Storage:RainLoop:Cache'),
@@ -932,4 +932,4 @@
 
 	module.exports = MailBoxMessageListViewModel;
 
-}(module, require));
+}());

dev/ViewModels/MailBoxMessageViewViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,11 +9,11 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Consts = require('Consts'),
-		Enums = require('Enums'),
-		Globals = require('Globals'),
-		Utils = require('Utils'),
-		Events = require('Events'),
+		Consts = require('Common/Consts'),
+		Enums = require('Common/Enums'),
+		Globals = require('Common/Globals'),
+		Utils = require('Common/Utils'),
+		Events = require('Common/Events'),
 
 		Cache = require('Storage:RainLoop:Cache'),
 		Data = require('Storage:RainLoop:Data'),
@@ -719,4 +719,4 @@
 
 	module.exports = MailBoxMessageViewViewModel;
 
-}(module, require));
+}());

dev/ViewModels/MailBoxSystemDropDownViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -25,4 +25,4 @@
 
 	module.exports = MailBoxSystemDropDownViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsActivateViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Settings = require('Storage:Settings'),
 		Data = require('Storage:Admin:Data'),
@@ -138,4 +138,4 @@
 
 	module.exports = PopupsActivateViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsAddAccountViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,8 +7,8 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		Remote = require('Storage:RainLoop:Remote'),
 
@@ -113,4 +113,4 @@
 
 	module.exports = PopupsAddAccountViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -7,7 +7,7 @@
 		_ = require('_'),
 		ko = require('ko'),
 
-		Utils = require('Utils'),
+		Utils = require('Common/Utils'),
 
 		Data = require('Storage:RainLoop:Data'),
 
@@ -107,4 +107,4 @@
 
 	module.exports = PopupsAddOpenPgpKeyViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsAdvancedSearchViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,7 +8,7 @@
 		ko = require('ko'),
 		moment = require('moment'),
 
-		Utils = require('Utils'),
+		Utils = require('Common/Utils'),
 
 		Data = require('Storage:RainLoop:Data'),
 
@@ -155,4 +155,4 @@
 
 	module.exports = PopupsAdvancedSearchViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsAskViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -8,8 +8,8 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Enums = require('Enums'),
-		Utils = require('Utils'),
+		Enums = require('Common/Enums'),
+		Utils = require('Common/Utils'),
 
 		kn = require('App:Knoin'),
 		KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
@@ -128,4 +128,4 @@
 
 	module.exports = PopupsAskViewModel;
 
-}(module, require));
+}());

dev/ViewModels/Popups/PopupsComposeOpenPgpViewModel.js

@@ -1,5 +1,5 @@
 
-(function (module, require) {
+(function () {
 
 	'use strict';
 
@@ -9,8 +9,8 @@
 		ko = require('ko'),
 		key = require('key'),
 
-		Utils = require('Utils'),
-		Enums = require('Enums'),
+		Utils = require('Common/Utils'),
+		Enums = require('Common/Enums'),
 
 		Data = require('Storage:RainLoop:Data'),
 
@@ -262,4 +262,4 @@
 
 	module.exports = PopupsComposeOpenPgpViewModel;
 
-}(module, require));
+}());