CommonJS (research/5)

.jshintrc

@@ -11,6 +11,7 @@
 	"regexp"		: true,
 	"undef"			: true,
 	"strict"		: true,
+	"unused"		: true,
 
 	"asi"			: false,
 	"boss"			: false,

dev/Admin/AdminSettingsAbout.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js')
+		ko = require('ko')
 	;
 
 	/**
@@ -85,4 +86,4 @@
 
 	module.exports = AdminSettingsAbout;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsBranding.js

@@ -1,13 +1,14 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Utils = require('../Common/Utils.js')
+		Utils = require('Utils')
 	;
 
 	/**
@@ -16,8 +17,8 @@
 	function AdminSettingsBranding()
 	{
 		var
-			Enums = require('../Common/Enums.js'),
-			AppSettings = require('..Storages/AppSettings.js')
+			Enums = require('Enums'),
+			AppSettings = require('../Storages/AppSettings.js')
 		;
 
 		this.title = ko.observable(AppSettings.settingsGet('Title'));
@@ -88,4 +89,4 @@
 
 	module.exports = AdminSettingsBranding;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsContacts.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		AppSettings = require('../Storages/AppSettings.js')
 	;
@@ -239,4 +240,4 @@
 
 	module.exports = AdminSettingsContacts;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsDomains.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		window = require('window'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
+		Enums = require('Enums'),
 
 		PopupsDomainViewModel = require('../ViewModels/Popups/PopupsDomainViewModel.js'),
 
@@ -57,7 +58,7 @@
 
 	AdminSettingsDomains.prototype.createDomain = function ()
 	{
-		require('../Knoin/Knoin.js').showScreenPopup(PopupsDomainViewModel);
+		require('kn').showScreenPopup(PopupsDomainViewModel);
 	};
 
 	AdminSettingsDomains.prototype.deleteDomain = function (oDomain)
@@ -92,7 +93,7 @@
 	{
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
-			require('../Knoin/Knoin.js').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
+			require('kn').showScreenPopup(PopupsDomainViewModel, [oData.Result]);
 		}
 	};
 
@@ -103,4 +104,4 @@
 
 	module.exports = AdminSettingsDomains;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsGeneral.js

@@ -1,15 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
@@ -131,7 +132,7 @@
 
 	AdminSettingsGeneral.prototype.selectLanguage = function ()
 	{
-		require('../Knoin/Knoin.js').showScreenPopup(PopupsLanguagesViewModel);
+		require('kn').showScreenPopup(PopupsLanguagesViewModel);
 	};
 
 	/**
@@ -144,4 +145,4 @@
 
 	module.exports = AdminSettingsGeneral;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsLicensing.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		moment = require('../External/moment.js'),
+		ko = require('ko'),
+		moment = require('moment'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
@@ -51,7 +52,7 @@
 
 	AdminSettingsLicensing.prototype.showActivationForm = function ()
 	{
-		require('../Knoin/Knoin.js').showScreenPopup(PopupsActivateViewModel);
+		require('kn').showScreenPopup(PopupsActivateViewModel);
 	};
 
 	/**
@@ -69,4 +70,4 @@
 
 	module.exports = AdminSettingsLicensing;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsLogin.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js')
@@ -68,4 +69,4 @@
 
 	module.exports = AdminSettingsLogin;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsPackages.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		ko = require('../External/ko.js'),
+		window = require('window'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		Data = require('../Storages/AdminDataStorage.js'),
 		Remote = require('../Storages/AdminAjaxRemoteStorage.js')
@@ -110,4 +111,4 @@
 
 	module.exports = AdminSettingsPackages;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsPlugins.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
@@ -86,7 +87,7 @@
 	{
 		if (Enums.StorageResultType.Success === sResult && oData && oData.Result)
 		{
-			require('../Knoin/Knoin.js').showScreenPopup(PopupsPluginViewModel, [oData.Result]);
+			require('kn').showScreenPopup(PopupsPluginViewModel, [oData.Result]);
 		}
 	};
 
@@ -112,4 +113,4 @@
 
 	module.exports = AdminSettingsPlugins;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsSecurity.js

@@ -1,15 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
@@ -133,4 +134,4 @@
 
 	module.exports = AdminSettingsSecurity;
 
-}(module));
+}(module, require));

dev/Admin/AdminSettingsSocial.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js')
+		Enums = require('Enums'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -150,4 +151,4 @@
 
 	module.exports = AdminSettingsSocial;
 
-}(module));
+}(module, require));

dev/Boots/AbstractApp.js

@@ -1,24 +1,25 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		window = require('../External/window.js'),
-		$html = require('../External/$html.js'),
-		$window = require('../External/$window.js'),
-		$doc = require('../External/$doc.js'),
+		$ = require('$'),
+		_ = require('_'),
+		window = require('window'),
+		$html = require('$html'),
+		$window = require('$window'),
+		$doc = require('$doc'),
 
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
-		Events = require('../Common/Events.js'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
+		Events = require('Events'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 
-		KnoinAbstractBoot = require('../Knoin/KnoinAbstractBoot.js')
+		KnoinAbstractBoot = require('KnoinAbstractBoot')
 	;
 
 	/**
@@ -141,7 +142,7 @@
 	AbstractApp.prototype.loginAndLogoutReload = function (bLogout, bClose)
 	{
 		var
-			kn = require('../Knoin/Knoin.js'),
+			kn = require('kn'),
 			sCustomLogoutLink = Utils.pString(AppSettings.settingsGet('CustomLogoutLink')),
 			bInIframe = !!AppSettings.settingsGet('InIframe')
 		;
@@ -270,4 +271,4 @@
 
 	module.exports = AbstractApp;
 
-}(module));
+}(module, require));

dev/Boots/AdminApp.js

@@ -1,18 +1,19 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		_ = require('../External/underscore.js'),
-		window = require('../External/window.js'),
+		ko = require('ko'),
+		_ = require('_'),
+		window = require('window'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
@@ -326,4 +327,4 @@
 
 	module.exports = new AdminApp();
 
-}(module));
+}(module, require));

dev/Boots/Boot.js

@@ -1,18 +1,19 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		_ = require('../External/underscore.js'),
-		$ = require('../External/jquery.js'),
-		$window = require('../External/$window.js'),
-		$html = require('../External/$html.js'),
+		window = require('window'),
+		_ = require('_'),
+		$ = require('$'),
+		$window = require('$window'),
+		$html = require('$html'),
 
-		Globals = require('../Common/Globals.js'),
-		Plugins = require('../Common/Plugins.js'),
-		Utils = require('../Common/Utils.js')
+		Globals = require('Globals'),
+		Plugins = require('Plugins'),
+		Utils = require('Utils')
 	;
 
 	module.exports = function (App) {
@@ -45,7 +46,7 @@
 		window['rl']['createCommand'] = Utils.createCommand;
 
 		window['rl']['EmailModel'] = require('../Models/EmailModel.js');
-		window['rl']['Enums'] = require('../Common/Enums.js');
+		window['rl']['Enums'] = require('Enums');
 
 		window['__RLBOOT'] = function (fCall) {
 
@@ -74,4 +75,4 @@
 
 	};
 
-}(module));
+}(module, require));

dev/Boots/RainLoopApp.js

@@ -1,23 +1,24 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		moment = require('../External/moment.js'),
+		window = require('window'),
+		$ = require('$'),
+		_ = require('_'),
+		moment = require('moment'),
 
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Consts = require('../Common/Consts.js'),
-		Plugins = require('../Common/Plugins.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
-		Events = require('../Common/Events.js'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Consts = require('Consts'),
+		Plugins = require('Plugins'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
+		Events = require('Events'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 
 		LocalStorage = require('../Storages/LocalStorage.js'),
 		AppSettings = require('../Storages/AppSettings.js'),
@@ -1579,4 +1580,4 @@
 
 	module.exports = new RainLoopApp();
 
-}(module));
+}(module, require));

dev/Common/Base64.js

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

dev/Common/Consts.js

@@ -1,8 +1,9 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 (function (module) {
 
+	'use strict';
+
 	var Consts = {};
 
 	Consts.Values = {};
@@ -125,4 +126,4 @@
 
 	module.exports = Consts;
 
-}(module));
+}(module, require));

dev/Common/Enums.js

@@ -1,8 +1,9 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 (function (module) {
 
+	'use strict';
+
 	var Enums = {};
 
 	/**
@@ -436,4 +437,4 @@
 
 	module.exports = Enums;
 
-}(module));
+}(module, require));

dev/Common/Events.js

@@ -1,13 +1,14 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
-		Utils = require('./Utils.js'),
-		Plugins = require('./Plugins.js')
+		Utils = require('Utils'),
+		Plugins = require('Plugins')
 	;
 
 	/**
@@ -62,4 +63,4 @@
 
 	module.exports = new Events();
 
-}(module));
+}(module, require));

dev/Common/Globals.js

@@ -1,16 +1,17 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-(function (module) {
+(function (module, require) {
+
+	'use strict';
 
 	var
 		Globals = {},
-		window = require('../External/window.js'),
-		ko = require('../External/ko.js'),
-		key = require('../External/key.js'),
-		$html = require('../External/$html.js'),
+		window = require('window'),
+		ko = require('ko'),
+		key = require('key'),
+		$html = require('$html'),
 
-		Enums = require('../Common/Enums.js')
+		Enums = require('Enums')
 	;
 
 	/**
@@ -272,4 +273,4 @@
 
 	module.exports = Globals;
 
-}(module));
+}(module, require));

dev/Common/LinkBuilder.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		Utils = require('./Utils.js')
+		window = require('window'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -326,4 +327,4 @@
 
 	module.exports = new LinkBuilder();
 
-}(module));
+}(module, require));

dev/Common/NewHtmlEditorWrapper.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		_ = require('../External/underscore.js'),
-		Globals = require('./Globals.js'),
+		window = require('window'),
+		_ = require('_'),
+		Globals = require('Globals'),
 		AppSettings = require('../Storages/AppSettings.js')
 	;
 
@@ -271,4 +272,4 @@
 
 	module.exports = NewHtmlEditorWrapper;
 
-}(module));
+}(module, require));

dev/Common/Plugins.js

@@ -1,7 +1,8 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-(function (module) {
+(function (module, require) {
+
+	'use strict';
 
 	var
 		Plugins = {
@@ -9,8 +10,8 @@
 			__remote: null,
 			__data: null
 		},
-		_ = require('../External/underscore.js'),
-		Utils = require('./Utils.js')
+		_ = require('_'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -112,4 +113,4 @@
 
 	module.exports = Plugins;
 
-}(module));
+}(module, require));

dev/Common/Selector.js

@@ -1,16 +1,17 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		key = require('../External/key.js'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		key = require('key'),
 
-		Enums = require('./Enums.js'),
-		Utils = require('./Utils.js')
+		Enums = require('Enums'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -726,4 +727,4 @@
 
 	module.exports = Selector;
 
-}(module));
+}(module, require));

dev/Common/Utils.js

@@ -1,24 +1,25 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-(function (module) {
+(function (module, require) {
+
+	'use strict';
 	
 	var
 		Utils = {},
 
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		window = require('../External/window.js'),
-		$window = require('../External/$window.js'),
-		$html = require('../External/$html.js'),
-		$div = require('../External/$div.js'),
-		$doc = require('../External/$doc.js'),
-		NotificationClass = require('../External/NotificationClass.js'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		window = require('window'),
+		$window = require('$window'),
+		$html = require('$html'),
+		$div = require('$div'),
+		$doc = require('$doc'),
+		NotificationClass = require('NotificationClass'),
 
-		Enums = require('./Enums.js'),
-		Consts = require('./Consts.js'),
-		Globals = require('./Globals.js')
+		Enums = require('Enums'),
+		Consts = require('Consts'),
+		Globals = require('Globals')
 	;
 
 	Utils.trim = $.trim;
@@ -2045,4 +2046,4 @@
 
 	module.exports = Utils;
 
-}(module));
+}(module, require));

dev/External/$div.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-module.exports = require('./jquery.js')('<div></div>');
+module.exports = require('$')('<div></div>');

dev/External/$doc.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-module.exports = require('./jquery.js')(window.document);
+module.exports = require('$')(window.document);

dev/External/$html.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-module.exports = require('./jquery.js')('html');
+module.exports = require('$')('html');

dev/External/$window.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-module.exports = require('./jquery.js')(window);
+module.exports = require('$')(window);

dev/External/AppData.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-module.exports = require('./window.js')['rainloopAppData'] || {};
+module.exports = require('window')['rainloopAppData'] || {};

dev/External/JSON.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = JSON;

dev/External/Jua.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = Jua;

dev/External/NotificationClass.js

@@ -1,5 +1,4 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-var window = require('./window.js');
-module.exports = window.Notification && window.Notification.requestPermission ? window.Notification : null;
+var w = require('window');
+module.exports = w.Notification && w.Notification.requestPermission ? w.Notification : null;

dev/External/crossroads.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = crossroads;

dev/External/hasher.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = hasher;

dev/External/ifvisible.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = ifvisible;

dev/External/jquery.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = $;

dev/External/key.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = key;

dev/External/ko.js

@@ -1,22 +1,23 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 (function (module, ko) {
 
+	'use strict';
+	
 	var
-		window = require('./window.js'),
-		_ = require('./underscore.js'),
-		$ = require('./jquery.js'),
-		$window = require('./$window.js'),
-		$doc = require('./$doc.js')
+		window = require('window'),
+		_ = require('_'),
+		$ = require('$'),
+		$window = require('$window'),
+		$doc = require('$doc')
 	;
 
 	ko.bindingHandlers.tooltip = {
 		'init': function (oElement, fValueAccessor) {
 
 			var
-				Globals = require('../Common/Globals.js'),
-				Utils = require('../Common/Utils.js')
+				Globals = require('Globals'),
+				Utils = require('Utils')
 			;
 
 			if (!Globals.bMobileDevice)
@@ -54,7 +55,7 @@
 	ko.bindingHandlers.tooltip2 = {
 		'init': function (oElement, fValueAccessor) {
 			var
-				Globals = require('../Common/Globals.js'),
+				Globals = require('Globals'),
 				$oEl = $(oElement),
 				sClass = $oEl.data('tooltip-class') || '',
 				sPlacement = $oEl.data('tooltip-placement') || 'top'
@@ -87,7 +88,7 @@
 
 			var
 				$oEl = $(oElement),
-				Globals = require('../Common/Globals.js')
+				Globals = require('Globals')
 			;
 
 			$oEl.tooltip({
@@ -121,7 +122,7 @@
 
 	ko.bindingHandlers.registrateBootstrapDropdown = {
 		'init': function (oElement) {
-			var Globals = require('../Common/Globals.js');
+			var Globals = require('Globals');
 			Globals.aBootstrapDropdowns.push($(oElement));
 		}
 	};
@@ -132,7 +133,7 @@
 			{
 				var
 					$el = $(oElement),
-					Utils = require('../Common/Utils.js')
+					Utils = require('Utils')
 				;
 
 				if (!$el.hasClass('open'))
@@ -162,7 +163,7 @@
 
 	ko.bindingHandlers.csstext = {
 		'init': function (oElement, fValueAccessor) {
-			var Utils = require('../Common/Utils.js');
+			var Utils = require('Utils');
 			if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText))
 			{
 				oElement.styleSheet.cssText = ko.utils.unwrapObservable(fValueAccessor());
@@ -173,7 +174,7 @@
 			}
 		},
 		'update': function (oElement, fValueAccessor) {
-			var Utils = require('../Common/Utils.js');
+			var Utils = require('Utils');
 			if (oElement && oElement.styleSheet && !Utils.isUnd(oElement.styleSheet.cssText))
 			{
 				oElement.styleSheet.cssText = ko.utils.unwrapObservable(fValueAccessor());
@@ -241,8 +242,8 @@
 		'init': function (oElement, fValueAccessor) {
 
 			var
-				Globals = require('../Common/Globals.js'),
-				Utils = require('../Common/Utils.js')
+				Globals = require('Globals'),
+				Utils = require('Utils')
 			;
 
 			$(oElement).toggleClass('fade', !Globals.bMobileDevice).modal({
@@ -264,14 +265,14 @@
 
 	ko.bindingHandlers.i18nInit = {
 		'init': function (oElement) {
-			var Utils = require('../Common/Utils.js');
+			var Utils = require('Utils');
 			Utils.i18nToNode(oElement);
 		}
 	};
 
 	ko.bindingHandlers.i18nUpdate = {
 		'update': function (oElement, fValueAccessor) {
-			var Utils = require('../Common/Utils.js');
+			var Utils = require('Utils');
 			ko.utils.unwrapObservable(fValueAccessor());
 			Utils.i18nToNode(oElement);
 		}
@@ -312,7 +313,7 @@
 		'update': function (oElement, fValueAccessor) {
 
 			var
-				Utils = require('../Common/Utils.js'),
+				Utils = require('Utils'),
 				aValues = ko.utils.unwrapObservable(fValueAccessor()),
 				iValue = Utils.pInt(aValues[1]),
 				iSize = 0,
@@ -346,8 +347,8 @@
 	ko.bindingHandlers.draggable = {
 		'init': function (oElement, fValueAccessor, fAllBindingsAccessor) {
 			var
-				Globals = require('../Common/Globals.js'),
-				Utils = require('../Common/Utils.js')
+				Globals = require('Globals'),
+				Utils = require('Utils')
 			;
 			if (!Globals.bMobileDevice)
 			{
@@ -429,7 +430,7 @@
 
 	ko.bindingHandlers.droppable = {
 		'init': function (oElement, fValueAccessor, fAllBindingsAccessor) {
-			var Globals = require('../Common/Globals.js');
+			var Globals = require('Globals');
 			if (!Globals.bMobileDevice)
 			{
 				var
@@ -471,7 +472,7 @@
 
 	ko.bindingHandlers.nano = {
 		'init': function (oElement) {
-			var Globals = require('../Common/Globals.js');
+			var Globals = require('Globals');
 			if (!Globals.bDisableNanoScroll)
 			{
 				$(oElement)
@@ -568,7 +569,7 @@
 		'init': function(oElement, fValueAccessor, fAllBindingsAccessor) {
 
 			var
-				Utils = require('../Common/Utils.js'),
+				Utils = require('Utils'),
 				EmailModel = require('../Models/EmailModel.js'),
 
 				$oEl = $(oElement),
@@ -642,7 +643,7 @@
 		'init': function(oElement, fValueAccessor, fAllBindingsAccessor) {
 
 			var
-				Utils = require('../Common/Utils.js'),
+				Utils = require('Utils'),
 				ContactTagModel = require('../Models/ContactTagModel.js'),
 
 				$oEl = $(oElement),
@@ -757,7 +758,7 @@
 	ko.extenders.trimmer = function (oTarget)
 	{
 		var
-			Utils = require('../Common/Utils.js'),
+			Utils = require('Utils'),
 			oResult = ko.computed({
 				'read': oTarget,
 				'write': function (sNewValue) {
@@ -774,7 +775,7 @@
 	ko.extenders.posInterer = function (oTarget, iDefault)
 	{
 		var
-			Utils = require('../Common/Utils.js'),
+			Utils = require('Utils'),
 			oResult = ko.computed({
 				'read': oTarget,
 				'write': function (sNewValue) {
@@ -830,7 +831,7 @@
 
 	ko.extenders.falseTimeout = function (oTarget, iOption)
 	{
-		var Utils = require('../Common/Utils.js');
+		var Utils = require('Utils');
 
 		oTarget.iTimeout = 0;
 		oTarget.subscribe(function (bValue) {
@@ -855,7 +856,7 @@
 
 	ko.observable.fn.validateEmail = function ()
 	{
-		var Utils = require('../Common/Utils.js');
+		var Utils = require('Utils');
 
 		this.hasError = ko.observable(false);
 
@@ -870,7 +871,7 @@
 
 	ko.observable.fn.validateSimpleEmail = function ()
 	{
-		var Utils = require('../Common/Utils.js');
+		var Utils = require('Utils');
 
 		this.hasError = ko.observable(false);
 
@@ -885,7 +886,7 @@
 
 	ko.observable.fn.validateFunc = function (fFunc)
 	{
-		var Utils = require('../Common/Utils.js');
+		var Utils = require('Utils');
 
 		this.hasFuncError = ko.observable(false);
 

dev/External/moment.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = moment;

dev/External/ssm.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = ssm;

dev/External/underscore.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = _;

dev/External/window.js

@@ -1,4 +1,3 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 module.exports = window;

dev/Knoin/Knoin.js

@@ -1,21 +1,22 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		hasher = require('../External/hasher.js'),
-		crossroads = require('../External/crossroads.js'),
-		$html = require('../External/$html.js'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		hasher = require('hasher'),
+		crossroads = require('crossroads'),
+		$html = require('$html'),
 
-		Globals = require('../Common/Globals.js'),
-		Plugins = require('../Common/Plugins.js'),
-		Utils = require('../Common/Utils.js'),
+		Globals = require('Globals'),
+		Plugins = require('Plugins'),
+		Utils = require('Utils'),
 
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -446,4 +447,4 @@
 
 	module.exports = new Knoin();
 
-}(module));
+}(module, require));

dev/Knoin/KnoinAbstractBoot.js

@@ -1,8 +1,9 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
 (function (module) {
 	
+	'use strict';
+
 	/**
 	 * @constructor
 	 */
@@ -18,4 +19,4 @@
 
 	module.exports = KnoinAbstractBoot;
 
-}(module));
+}(module, require));

dev/Knoin/KnoinAbstractScreen.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		crossroads = require('../External/crossroads.js'),
-		Utils = require('../Common/Utils.js')
+		crossroads = require('crossroads'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -86,4 +87,4 @@
 
 	module.exports = KnoinAbstractScreen;
 
-}(module));
+}(module, require));

dev/Knoin/KnoinAbstractViewModel.js

@@ -1,15 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		$window = require('../External/$window.js'),
+		ko = require('ko'),
+		$window = require('$window'),
 
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js')
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -107,4 +108,4 @@
 
 	module.exports = KnoinAbstractViewModel;
 
-}(module));
+}(module, require));

dev/Models/AccountModel.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js')
+		ko = require('ko')
 	;
 
 	/**
@@ -26,9 +27,9 @@
 	 */
 	AccountModel.prototype.changeAccountLink = function ()
 	{
-		return require('../Common/LinkBuilder.js').change(this.email);
+		return require('LinkBuilder').change(this.email);
 	};
 
 	module.exports = AccountModel;
 
-}(module));
+}(module, require));

dev/Models/AttachmentModel.js

@@ -1,13 +1,14 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js')
+		window = require('window'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder')
 	;
 
 	/**
@@ -248,4 +249,4 @@
 
 	module.exports = AttachmentModel;
 
-}(module));
+}(module, require));

dev/Models/ComposeAttachmentModel.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Utils = require('../Common/Utils.js')
+		ko = require('ko'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -72,4 +73,4 @@
 
 	module.exports = ComposeAttachmentModel;
 
-}(module));
+}(module, require));

dev/Models/ContactModel.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js')
+		_ = require('_'),
+		ko = require('ko'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder')
 	;
 
 	/**
@@ -137,4 +138,4 @@
 
 	module.exports = ContactModel;
 
-}(module));
+}(module, require));

dev/Models/ContactPropertyModel.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js')
+		ko = require('ko'),
+		Enums = require('Enums'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -39,4 +40,4 @@
 
 	module.exports = ContactPropertyModel;
 
-}(module));
+}(module, require));

dev/Models/ContactTagModel.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Utils = require('../Common/Utils.js')
+		ko = require('ko'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -54,4 +55,4 @@
 
 	module.exports = ContactTagModel;
 
-}(module));
+}(module, require));

dev/Models/EmailModel.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js')
+		Enums = require('Enums'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -374,4 +375,4 @@
 
 	module.exports = EmailModel;
 
-}(module));
+}(module, require));

dev/Models/FilterConditionModel.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Enums = require('../Common/Enums.js')
+		ko = require('ko'),
+		Enums = require('Enums')
 	;
 
 	/**
@@ -58,4 +59,4 @@
 
 	module.exports = FilterConditionModel;
 
-}(module));
+}(module, require));

dev/Models/FilterModel.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		ko = require('ko'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 		FilterConditionModel = require('./FilterConditionModel.js')
 	;
 
@@ -90,4 +91,4 @@
 
 	module.exports = FilterModel;
 
-}(module));
+}(module, require));

dev/Models/FolderModel.js

@@ -1,17 +1,18 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		$window = require('../External/$window.js'),
+		_ = require('_'),
+		ko = require('ko'),
+		$window = require('$window'),
 
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		Events = require('../Common/Events.js')
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		Events = require('Events')
 	;
 
 	/**
@@ -351,4 +352,4 @@
 
 	module.exports = FolderModel;
 
-}(module));
+}(module, require));

dev/Models/IdentityModel.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Utils = require('../Common/Utils.js')
+		ko = require('ko'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -46,4 +47,4 @@
 
 	module.exports = IdentityModel;
 
-}(module));
+}(module, require));

dev/Models/MessageModel.js

@@ -1,20 +1,21 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		moment = require('../External/moment.js'),
-		$window = require('../External/$window.js'),
-		$div = require('../External/$div.js'),
+		window = require('window'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		moment = require('moment'),
+		$window = require('$window'),
+		$div = require('$div'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		EmailModel = require('./EmailModel.js'),
 		AttachmentModel = require('./AttachmentModel.js')
@@ -1283,4 +1284,4 @@
 
 	module.exports = MessageModel;
 
-}(module));
+}(module, require));

dev/Models/OpenPgpKeyModel.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js')
+		ko = require('ko')
 	;
 
 	/**
@@ -40,4 +41,4 @@
 
 	module.exports = OpenPgpKeyModel;
 
-}(module));
+}(module, require));

dev/Screens/AbstractSettings.js

@@ -1,19 +1,20 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractScreen = require('../Knoin/KnoinAbstractScreen.js')
+		kn = require('kn'),
+		KnoinAbstractScreen = require('KnoinAbstractScreen')
 	;
 
 	/**
@@ -197,4 +198,4 @@
 
 	module.exports = AbstractSettings;
 
-}(module));
+}(module, require));

dev/Screens/AdminLoginScreen.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		KnoinAbstractScreen = require('../Knoin/KnoinAbstractScreen.js')
+		_ = require('_'),
+		KnoinAbstractScreen = require('KnoinAbstractScreen')
 	;
 
 	/**
@@ -28,4 +29,4 @@
 
 	module.exports = AdminLoginScreen;
 
-}(module));
+}(module, require));

dev/Screens/AdminSettingsScreen.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 		AbstractSettings = require('./AbstractSettings.js')
 	;
 
@@ -35,4 +36,4 @@
 
 	module.exports = AdminSettingsScreen;
 
-}(module));
+}(module, require));

dev/Screens/LoginScreen.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		KnoinAbstractScreen = require('../Knoin/KnoinAbstractScreen.js')
+		_ = require('_'),
+		KnoinAbstractScreen = require('KnoinAbstractScreen')
 	;
 
 	/**
@@ -28,4 +29,4 @@
 
 	module.exports = LoginScreen;
 
-}(module));
+}(module, require));

dev/Screens/MailBoxScreen.js

@@ -1,18 +1,19 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		$html = require('../External/$html.js'),
+		_ = require('_'),
+		$html = require('$html'),
 
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		Events = require('../Common/Events.js'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		Events = require('Events'),
 
-		KnoinAbstractScreen = require('../Knoin/KnoinAbstractScreen.js'),
+		KnoinAbstractScreen = require('KnoinAbstractScreen'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/WebMailDataStorage.js'),
@@ -204,4 +205,4 @@
 
 	module.exports = MailBoxScreen;
 
-}(module));
+}(module, require));

dev/Screens/SettingsScreen.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		Globals = require('../Common/Globals.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		Globals = require('Globals'),
 
 		AbstractSettings = require('./AbstractSettings.js')
 	;
@@ -52,4 +53,4 @@
 
 	module.exports = SettingsScreen;
 
-}(module));
+}(module, require));

dev/Settings/SettingsAccounts.js

@@ -1,21 +1,22 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		window = require('window'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 		PopupsAddAccountViewModel = require('../ViewModels/Popups/PopupsAddAccountViewModel.js')
 	;
 
@@ -99,4 +100,4 @@
 
 	module.exports = SettingsAccounts;
 
-}(module));
+}(module, require));

dev/Settings/SettingsChangePassword.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
 	;
@@ -118,4 +119,4 @@
 
 	module.exports = SettingsChangePassword;
 
-}(module));
+}(module, require));

dev/Settings/SettingsContacts.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		Utils = require('../Common/Utils.js'),
+		Utils = require('Utils'),
 
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 		Data = require('../Storages/WebMailDataStorage.js')
@@ -55,4 +56,4 @@
 
 	module.exports = SettingsContacts;
 
-}(module));
+}(module, require));

dev/Settings/SettingsFilters.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
-		Utils = require('../Common/Utils.js')
+		ko = require('ko'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -29,7 +30,7 @@
 	SettingsFilters.prototype.addFilter = function ()
 	{
 		var
-			kn = require('../Knoin/Knoin.js'),
+			kn = require('kn'),
 			FilterModel = require('../Models/FilterModel.js'),
 			PopupsFilterViewModel = require('../ViewModels/Popups/PopupsFilterViewModel.js')
 		;
@@ -39,4 +40,4 @@
 
 	module.exports = SettingsFilters;
 
-}(module));
+}(module, require));

dev/Settings/SettingsFolders.js

@@ -1,15 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		LocalStorage = require('../Storages/LocalStorage.js'),
@@ -218,4 +219,4 @@
 
 	module.exports = SettingsFolders;
 
-}(module));
+}(module, require));

dev/Settings/SettingsGeneral.js

@@ -1,22 +1,23 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		ko = require('../External/ko.js'),
+		$ = require('$'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Consts = require('../Common/Consts.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Consts = require('Consts'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 		PopupsLanguagesViewModel = require('../ViewModels/Popups/PopupsLanguagesViewModel.js')
 	;
 
@@ -177,4 +178,4 @@
 
 	module.exports = SettingsGeneral;
 
-}(module));
+}(module, require));

dev/Settings/SettingsIdentities.js

@@ -1,19 +1,20 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		NewHtmlEditorWrapper = require('../Common/NewHtmlEditorWrapper.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 		PopupsIdentityViewModel = require('../ViewModels/Popups/PopupsIdentityViewModel.js')
 	;
 
@@ -233,4 +234,4 @@
 
 	module.exports = SettingsIdentities;
 
-}(module));
+}(module, require));

dev/Settings/SettingsIdentity.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		NewHtmlEditorWrapper = require('../Common/NewHtmlEditorWrapper.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		NewHtmlEditorWrapper = require('NewHtmlEditorWrapper'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
@@ -99,4 +100,4 @@
 
 	module.exports = SettingsIdentity;
 
-}(module));
+}(module, require));

dev/Settings/SettingsOpenPGP.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 
@@ -85,4 +86,4 @@
 
 	module.exports = SettingsOpenPGP;
 
-}(module));
+}(module, require));

dev/Settings/SettingsSecurity.js

@@ -1,18 +1,19 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
 
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 		PopupsTwoFactorTestViewModel = require('../ViewModels/Popups/PopupsTwoFactorTestViewModel.js')
 	;
 
@@ -166,4 +167,4 @@
 
 	module.exports = SettingsSecurity;
 
-}(module));
+}(module, require));

dev/Settings/SettingsSocial.js

@@ -1,7 +1,8 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
-'use strict';
 
-(function (module) {
+(function (module, require) {
+
+	'use strict';
 
 	/**
 	 * @constructor
@@ -9,7 +10,7 @@
 	function SettingsSocial()
 	{
 		var
-			Utils = require('../Common/Utils.js'),
+			Utils = require('Utils'),
 			RL = require('../Boots/RainLoopApp.js'),
 			Data = require('../Storages/WebMailDataStorage.js')
 		;
@@ -74,4 +75,4 @@
 
 	module.exports = SettingsSocial;
 
-}(module));
+}(module, require));

dev/Settings/SettingsThemes.js

@@ -1,16 +1,17 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		ko = require('../External/ko.js'),
+		window = require('window'),
+		$ = require('$'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js')
@@ -128,4 +129,4 @@
 
 	module.exports = SettingsThemes;
 
-}(module));
+}(module, require));

dev/Storages/AbstractAjaxRemoteStorage.js

@@ -1,18 +1,19 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
+		window = require('window'),
+		$ = require('$'),
 
-		Consts = require('../Common/Consts.js'),
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		Plugins = require('../Common/Plugins.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Consts = require('Consts'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		Plugins = require('Plugins'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('./AppSettings.js')
 	;
@@ -307,4 +308,4 @@
 
 	module.exports = AbstractAjaxRemoteStorage;
 
-}(module));
+}(module, require));

dev/Storages/AbstractData.js

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

dev/Storages/AdminAjaxRemoteStorage.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
 		AbstractAjaxRemoteStorage = require('./AbstractAjaxRemoteStorage.js')
 	;
@@ -272,4 +273,4 @@
 
 	module.exports = new AdminAjaxRemoteStorage();
 
-}(module));
+}(module, require));

dev/Storages/AdminDataStorage.js

@@ -1,11 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
 		AbstractData = require('./AbstractData.js')
 	;
@@ -64,4 +65,4 @@
 
 	module.exports = new AdminDataStorage();
 
-}(module));
+}(module, require));

dev/Storages/AppSettings.js

@@ -1,12 +1,12 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		AppData = require('../External/AppData.js'),
-
-		Utils = require('../Common/Utils.js')
+		AppData = require('AppData'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -60,4 +60,4 @@
 
 	module.exports = new AppSettings();
 
-}(module));
+}(module, require));

dev/Storages/LocalStorage.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
 		CookieDriver = require('./LocalStorages/CookieDriver.js'),
 		LocalStorageDriver = require('./LocalStorages/LocalStorageDriver.js')
@@ -21,6 +22,8 @@
 			})
 		;
 
+		this.oDriver = null;
+
 		if (NextStorageDriver)
 		{
 			NextStorageDriver = /** @type {?Function} */ NextStorageDriver;
@@ -51,4 +54,4 @@
 
 	module.exports = new LocalStorage();
 
-}(module));
+}(module, require));

dev/Storages/LocalStorages/CookieDriver.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../../External/jquery.js'),
-		JSON = require('../../External/JSON.js'),
+		$ = require('$'),
+		JSON = require('JSON'),
 
-		Consts = require('../../Common/Consts.js'),
-		Utils = require('../../Common/Utils.js')
+		Consts = require('Consts'),
+		Utils = require('Utils')
 	;
 
 	/**
@@ -87,4 +88,4 @@
 
 	module.exports = CookieDriver;
 
-}(module));
+}(module, require));

dev/Storages/LocalStorages/LocalStorageDriver.js

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

dev/Storages/WebMailAjaxRemoteStorage.js

@@ -1,15 +1,16 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
-		Utils = require('../Common/Utils.js'),
-		Consts = require('../Common/Consts.js'),
-		Globals = require('../Common/Globals.js'),
-		Base64 = require('../Common/Base64.js'),
+		Utils = require('Utils'),
+		Consts = require('Consts'),
+		Globals = require('Globals'),
+		Base64 = require('Base64'),
 
 		AppSettings = require('./AppSettings.js'),
 		Cache = require('./WebMailCacheStorage.js'),
@@ -810,4 +811,4 @@
 
 	module.exports = new WebMailAjaxRemoteStorage();
 
-}(module));
+}(module, require));

dev/Storages/WebMailCacheStorage.js

@@ -1,14 +1,15 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
+		_ = require('_'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('./AppSettings.js')
 	;
@@ -345,4 +346,4 @@
 
 	module.exports = new WebMailCacheStorage();
 
-}(module));
+}(module, require));

dev/Storages/WebMailDataStorage.js

@@ -1,27 +1,28 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		moment = require('../External/moment.js'),
-		$div = require('../External/$div.js'),
-		NotificationClass = require('../External/NotificationClass.js'),
+		window = require('window'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		moment = require('moment'),
+		$div = require('$div'),
+		NotificationClass = require('NotificationClass'),
 
-		Consts = require('../Common/Consts.js'),
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Consts = require('Consts'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('./AppSettings.js'),
 		Cache = require('./WebMailCacheStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 
 		MessageModel = require('../Models/MessageModel.js'),
 
@@ -1024,4 +1025,4 @@
 
 	module.exports = new WebMailDataStorage();
 
-}(module));
+}(module, require));

dev/ViewModels/AbstractSystemDropDownViewModel.js

@@ -1,17 +1,18 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		window = require('../External/window.js'),
-		key = require('../External/key.js'),
+		_ = require('_'),
+		ko = require('ko'),
+		window = require('window'),
+		key = require('key'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/WebMailDataStorage.js'),
@@ -20,8 +21,8 @@
 		PopupsKeyboardShortcutsHelpViewModel = require('../ViewModels/Popups/PopupsKeyboardShortcutsHelpViewModel.js'),
 		PopupsAddAccountViewModel = require('../ViewModels/Popups/PopupsKeyboardShortcutsHelpViewModel.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -121,4 +122,4 @@
 
 	module.exports = AbstractSystemDropDownViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/AdminLoginViewModel.js

@@ -1,19 +1,20 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Enums = require('../Common/Enums.js'),
-		Utils = require('../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		Remote = require('../Storages/AdminAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -118,4 +119,4 @@
 
 	module.exports = AdminLoginViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/AdminMenuViewModel.js

@@ -1,12 +1,13 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		kn = require('../Knoin/Knoin.js'),
-		Globals = require('../Common/Globals.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		Globals = require('Globals'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -35,4 +36,4 @@
 
 	module.exports = AdminMenuViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/AdminPaneViewModel.js

@@ -1,17 +1,18 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../External/ko.js'),
+		ko = require('ko'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/AdminDataStorage.js'),
 		Remote = require('../Storages/AdminAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -42,4 +43,4 @@
 
 	module.exports = AdminPaneViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/LoginViewModel.js

@@ -1,24 +1,25 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
+		window = require('window'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
 
-		Utils = require('../Common/Utils.js'),
-		Enums = require('../Common/Enums.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Utils = require('Utils'),
+		Enums = require('Enums'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js'),
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel'),
 
 		PopupsLanguagesViewModel = require('../ViewModels/Popups/PopupsLanguagesViewModel.js')
 	;
@@ -371,4 +372,4 @@
 
 	module.exports = LoginViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/MailBoxFolderListViewModel.js

@@ -1,19 +1,20 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		window = require('../External/window.js'),
-		$ = require('../External/jquery.js'),
-		ko = require('../External/ko.js'),
-		key = require('../External/key.js'),
-		$html = require('../External/$html.js'),
+		window = require('window'),
+		$ = require('$'),
+		ko = require('ko'),
+		key = require('key'),
+		$html = require('$html'),
 
-		Utils = require('../Common/Utils.js'),
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
+		Utils = require('Utils'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		LinkBuilder = require('LinkBuilder'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Cache = require('../Storages/WebMailCacheStorage.js'),
@@ -23,8 +24,8 @@
 		PopupsFolderCreateViewModel = require('./Popups/PopupsFolderCreateViewModel.js'),
 		PopupsContactsViewModel = require('./Popups/PopupsContactsViewModel.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -279,4 +280,4 @@
 
 	module.exports = MailBoxFolderListViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/MailBoxMessageListViewModel.js

@@ -1,31 +1,32 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 	
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		_ = require('../External/underscore.js'),
-		ko = require('../External/ko.js'),
-		key = require('../External/key.js'),
-		ifvisible = require('../External/ifvisible.js'),
-		Jua = require('../External/Jua.js'),
+		$ = require('$'),
+		_ = require('_'),
+		ko = require('ko'),
+		key = require('key'),
+		ifvisible = require('ifvisible'),
+		Jua = require('Jua'),
 
-		Enums = require('../Common/Enums.js'),
-		Consts = require('../Common/Consts.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		LinkBuilder = require('../Common/LinkBuilder.js'),
-		Events = require('../Common/Events.js'),
-		Selector = require('../Common/Selector.js'),
+		Enums = require('Enums'),
+		Consts = require('Consts'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		LinkBuilder = require('LinkBuilder'),
+		Events = require('Events'),
+		Selector = require('Selector'),
 
 		AppSettings = require('../Storages/AppSettings.js'),
 		Cache = require('../Storages/WebMailCacheStorage.js'),
 		Data = require('../Storages/WebMailDataStorage.js'),
 		Remote = require('../Storages/WebMailAjaxRemoteStorage.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js'),
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel'),
 
 		PopupsComposeViewModel = require('./Popups/PopupsComposeViewModel.js'),
 		PopupsAdvancedSearchViewModel = require('./Popups/PopupsAdvancedSearchViewModel.js'),
@@ -942,4 +943,4 @@
 
 	module.exports = MailBoxMessageListViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/MailBoxMessageViewViewModel.js

@@ -1,19 +1,20 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		$ = require('../External/jquery.js'),
-		ko = require('../External/ko.js'),
-		key = require('../External/key.js'),
-		$html = require('../External/$html.js'),
+		$ = require('$'),
+		ko = require('ko'),
+		key = require('key'),
+		$html = require('$html'),
 
-		Consts = require('../Common/Consts.js'),
-		Enums = require('../Common/Enums.js'),
-		Globals = require('../Common/Globals.js'),
-		Utils = require('../Common/Utils.js'),
-		Events = require('../Common/Events.js'),
+		Consts = require('Consts'),
+		Enums = require('Enums'),
+		Globals = require('Globals'),
+		Utils = require('Utils'),
+		Events = require('Events'),
 
 		Cache = require('../Storages/WebMailCacheStorage.js'),
 		Data = require('../Storages/WebMailDataStorage.js'),
@@ -21,8 +22,8 @@
 
 		PopupsComposeViewModel = require('./Popups/PopupsComposeViewModel.js'),
 
-		kn = require('../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -719,4 +720,4 @@
 
 	module.exports = MailBoxMessageViewViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/MailBoxSystemDropDownViewModel.js

@@ -1,10 +1,11 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+	
 	'use strict';
 
-(function (module) {
-
 	var
-		kn = require('../Knoin/Knoin.js'),
+		kn = require('kn'),
 		AbstractSystemDropDownViewModel = require('./AbstractSystemDropDownViewModel.js')
 	;
 
@@ -22,4 +23,4 @@
 
 	module.exports = MailBoxSystemDropDownViewModel;
 
-}(module));
+}(module, require));

dev/ViewModels/Popups/PopupsActivateViewModel.js

@@ -1,20 +1,21 @@
 /* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+
+(function (module, require) {
+
 	'use strict';
 
-(function (module) {
-
 	var
-		ko = require('../../External/ko.js'),
+		ko = require('ko'),
 
-		Enums = require('../../Common/Enums.js'),
-		Utils = require('../../Common/Utils.js'),
+		Enums = require('Enums'),
+		Utils = require('Utils'),
 
 		AppSettings = require('../../Storages/AppSettings.js'),
 		Data = require('../../Storages/AdminDataStorage.js'),
 		Remote = require('../../Storages/AdminAjaxRemoteStorage.js'),
 
-		kn = require('../../Knoin/Knoin.js'),
-		KnoinAbstractViewModel = require('../../Knoin/KnoinAbstractViewModel.js')
+		kn = require('kn'),
+		KnoinAbstractViewModel = require('KnoinAbstractViewModel')
 	;
 
 	/**
@@ -136,4 +137,4 @@
 
 	module.exports = PopupsActivateViewModel;
 
-}(module));
+}(module, require));