Code refactoring

Fixed owncloud password encoder/decoder (#291)
Fixed ckeditor in ownCloud iframe (Closes #302)
Release commit

dev/Settings/App/Accounts.js

@@ -12,14 +12,14 @@
 		Utils = require('Common/Utils'),
 		LinkBuilder = require('Common/LinkBuilder'),
 
-		Data = require('Storage:RainLoop:Data'),
-		Remote = require('Storage:RainLoop:Remote')
+		Data = require('Storage/App/Data'),
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsAccounts()
+	function AccountsAppSetting()
 	{
 		this.accounts = Data.accounts;
 
@@ -46,22 +46,22 @@
 		]});
 	}
 
-	SettingsAccounts.prototype.addNewAccount = function ()
+	AccountsAppSetting.prototype.addNewAccount = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:AddAccount'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/AddAccount'));
 	};
 
 	/**
 	 * @param {AccountModel} oAccountToRemove
 	 */
-	SettingsAccounts.prototype.deleteAccount = function (oAccountToRemove)
+	AccountsAppSetting.prototype.deleteAccount = function (oAccountToRemove)
 	{
 		if (oAccountToRemove && oAccountToRemove.deleteAccess())
 		{
 			this.accountForDeletion(null);
 
 			var
-				kn = require('App:Knoin'),
+				kn = require('Knoin/Knoin'),
 				fRemoveAccount = function (oAccount) {
 					return oAccountToRemove === oAccount;
 				}
@@ -86,7 +86,7 @@
 					}
 					else
 					{
-						require('App:RainLoop').accountsAndIdentities();
+						require('App/App').accountsAndIdentities();
 					}
 
 				}, oAccountToRemove.email);
@@ -94,6 +94,6 @@
 		}
 	};
 
-	module.exports = SettingsAccounts;
+	module.exports = AccountsAppSetting;
 
 }());

dev/Settings/App/ChangePassword.js

@@ -10,13 +10,13 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Remote = require('Storage:RainLoop:Remote')
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsChangePassword()
+	function ChangePasswordAppSetting()
 	{
 		this.changeProcess = ko.observable(false);
 
@@ -76,7 +76,7 @@
 		this.onChangePasswordResponse = _.bind(this.onChangePasswordResponse, this);
 	}
 
-	SettingsChangePassword.prototype.onHide = function ()
+	ChangePasswordAppSetting.prototype.onHide = function ()
 	{
 		this.changeProcess(false);
 		this.currentPassword('');
@@ -87,7 +87,7 @@
 		this.currentPassword.error(false);
 	};
 
-	SettingsChangePassword.prototype.onChangePasswordResponse = function (sResult, oData)
+	ChangePasswordAppSetting.prototype.onChangePasswordResponse = function (sResult, oData)
 	{
 		this.changeProcess(false);
 		this.passwordMismatch(false);
@@ -116,6 +116,6 @@
 		}
 	};
 
-	module.exports = SettingsChangePassword;
+	module.exports = ChangePasswordAppSetting;
 
 }());

dev/Settings/App/Contacts.js

@@ -6,16 +6,14 @@
 	var
 		ko = require('ko'),
 
-		Utils = require('Common/Utils'),
-
-		Remote = require('Storage:RainLoop:Remote'),
-		Data = require('Storage:RainLoop:Data')
+		Remote = require('Storage/App/Remote'),
+		Data = require('Storage/App/Data')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsContacts()
+	function ContactsAppSetting()
 	{
 		this.contactsAutosave = Data.contactsAutosave;
 
@@ -44,7 +42,7 @@
 		}, this);
 	}
 
-	SettingsContacts.prototype.onBuild = function ()
+	ContactsAppSetting.prototype.onBuild = function ()
 	{
 		Data.contactsAutosave.subscribe(function (bValue) {
 			Remote.saveSettings(null, {
@@ -53,6 +51,6 @@
 		});
 	};
 
-	module.exports = SettingsContacts;
+	module.exports = ContactsAppSetting;
 
 }());

dev/Settings/App/Filters.js

@@ -12,7 +12,7 @@
 	/**
 	 * @constructor
 	 */
-	function SettingsFilters()
+	function FiltersAppSetting()
 	{
 		this.filters = ko.observableArray([]);
 		this.filters.loading = ko.observable(false);
@@ -22,21 +22,21 @@
 		});
 	}
 
-	SettingsFilters.prototype.deleteFilter = function (oFilter)
+	FiltersAppSetting.prototype.deleteFilter = function (oFilter)
 	{
 		this.filters.remove(oFilter);
 	};
 
-	SettingsFilters.prototype.addFilter = function ()
+	FiltersAppSetting.prototype.addFilter = function ()
 	{
 		var
 			FilterModel = require('Model/Filter')
 		;
 
-		require('App:Knoin').showScreenPopup(
-			require('View:Popup:Filter'), [new FilterModel()]);
+		require('Knoin/Knoin').showScreenPopup(
+			require('View/Popup/Filter'), [new FilterModel()]);
 	};
 
-	module.exports = SettingsFilters;
+	module.exports = FiltersAppSetting;
 
 }());

dev/Settings/App/Folders.js

@@ -9,17 +9,17 @@
 		Enums = require('Common/Enums'),
 		Utils = require('Common/Utils'),
 
-		Settings = require('Storage:Settings'),
-		Data = require('Storage:RainLoop:Data'),
-		Cache = require('Storage:RainLoop:Cache'),
-		Remote = require('Storage:RainLoop:Remote'),
-		LocalStorage = require('Storage:LocalStorage')
+		Settings = require('Storage/Settings'),
+		Data = require('Storage/App/Data'),
+		Cache = require('Storage/App/Cache'),
+		Remote = require('Storage/App/Remote'),
+		Local = require('Storage/Local')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsFolders()
+	function FoldersAppSetting()
 	{
 		this.foldersListError = Data.foldersListError;
 		this.folderList = Data.folderList;
@@ -89,7 +89,7 @@
 		this.useImapSubscribe = !!Settings.settingsGet('UseImapSubscribe');
 	}
 
-	SettingsFolders.prototype.folderEditOnEnter = function (oFolder)
+	FoldersAppSetting.prototype.folderEditOnEnter = function (oFolder)
 	{
 		var
 			sEditName = oFolder ? Utils.trim(oFolder.nameForEdit()) : ''
@@ -97,7 +97,7 @@
 
 		if ('' !== sEditName && oFolder.name() !== sEditName)
 		{
-			LocalStorage.set(Enums.ClientSideKeyName.FoldersLashHash, '');
+			Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
 
 			Data.foldersRenaming(true);
 			Remote.folderRename(function (sResult, oData) {
@@ -109,7 +109,7 @@
 						oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_RENAME_FOLDER'));
 				}
 
-				require('App:RainLoop').folders();
+				require('App/App').folders();
 
 			}, oFolder.fullNameRaw, sEditName);
 
@@ -121,7 +121,7 @@
 		oFolder.edited(false);
 	};
 
-	SettingsFolders.prototype.folderEditOnEsc = function (oFolder)
+	FoldersAppSetting.prototype.folderEditOnEsc = function (oFolder)
 	{
 		if (oFolder)
 		{
@@ -129,22 +129,22 @@
 		}
 	};
 
-	SettingsFolders.prototype.onShow = function ()
+	FoldersAppSetting.prototype.onShow = function ()
 	{
 		Data.foldersListError('');
 	};
 
-	SettingsFolders.prototype.createFolder = function ()
+	FoldersAppSetting.prototype.createFolder = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:FolderCreate'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/FolderCreate'));
 	};
 
-	SettingsFolders.prototype.systemFolder = function ()
+	FoldersAppSetting.prototype.systemFolder = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:FolderSystem'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/FolderSystem'));
 	};
 
-	SettingsFolders.prototype.deleteFolder = function (oFolderToRemove)
+	FoldersAppSetting.prototype.deleteFolder = function (oFolderToRemove)
 	{
 		if (oFolderToRemove && oFolderToRemove.canBeDeleted() && oFolderToRemove.deleteAccess() &&
 			0 === oFolderToRemove.privateMessageCountAll())
@@ -166,7 +166,7 @@
 
 			if (oFolderToRemove)
 			{
-				LocalStorage.set(Enums.ClientSideKeyName.FoldersLashHash, '');
+				Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
 
 				Data.folderList.remove(fRemoveFolder);
 
@@ -180,7 +180,7 @@
 							oData && oData.ErrorCode ? Utils.getNotification(oData.ErrorCode) : Utils.i18n('NOTIFICATIONS/CANT_DELETE_FOLDER'));
 					}
 
-					require('App:RainLoop').folders();
+					require('App/App').folders();
 
 				}, oFolderToRemove.fullNameRaw);
 
@@ -193,22 +193,22 @@
 		}
 	};
 
-	SettingsFolders.prototype.subscribeFolder = function (oFolder)
+	FoldersAppSetting.prototype.subscribeFolder = function (oFolder)
 	{
-		LocalStorage.set(Enums.ClientSideKeyName.FoldersLashHash, '');
+		Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
 		Remote.folderSetSubscribe(Utils.emptyFunction, oFolder.fullNameRaw, true);
 
 		oFolder.subScribed(true);
 	};
 
-	SettingsFolders.prototype.unSubscribeFolder = function (oFolder)
+	FoldersAppSetting.prototype.unSubscribeFolder = function (oFolder)
 	{
-		LocalStorage.set(Enums.ClientSideKeyName.FoldersLashHash, '');
+		Local.set(Enums.ClientSideKeyName.FoldersLashHash, '');
 		Remote.folderSetSubscribe(Utils.emptyFunction, oFolder.fullNameRaw, false);
 
 		oFolder.subScribed(false);
 	};
 
-	module.exports = SettingsFolders;
+	module.exports = FoldersAppSetting;
 
 }());

dev/Settings/App/General.js

@@ -5,23 +5,21 @@
 
 	var
 		_ = require('_'),
-		$ = require('$'),
 		ko = require('ko'),
 
 		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')
+		Data = require('Storage/App/Data'),
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsGeneral()
+	function GeneralAppSetting()
 	{
 		this.mainLanguage = Data.mainLanguage;
 		this.mainMessagesPerPage = Data.mainMessagesPerPage;
@@ -57,12 +55,12 @@
 		this.isAnimationSupported = Globals.bAnimationSupported;
 	}
 
-	SettingsGeneral.prototype.toggleLayout = function ()
+	GeneralAppSetting.prototype.toggleLayout = function ()
 	{
 		this.layout(Enums.Layout.NoPreview === this.layout() ? Enums.Layout.SidePreview : Enums.Layout.NoPreview);
 	};
 
-	SettingsGeneral.prototype.onBuild = function ()
+	GeneralAppSetting.prototype.onBuild = function ()
 	{
 		var self = this;
 
@@ -158,16 +156,16 @@
 		}, 50);
 	};
 
-	SettingsGeneral.prototype.onShow = function ()
+	GeneralAppSetting.prototype.onShow = function ()
 	{
 		Data.desktopNotifications.valueHasMutated();
 	};
 
-	SettingsGeneral.prototype.selectLanguage = function ()
+	GeneralAppSetting.prototype.selectLanguage = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:Languages'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Languages'));
 	};
 
-	module.exports = SettingsGeneral;
+	module.exports = GeneralAppSetting;
 
 }());

dev/Settings/App/Identities.js

@@ -11,14 +11,14 @@
 		Utils = require('Common/Utils'),
 		HtmlEditor = require('Common/HtmlEditor'),
 
-		Data = require('Storage:RainLoop:Data'),
-		Remote = require('Storage:RainLoop:Remote')
+		Data = require('Storage/App/Data'),
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsIdentities()
+	function IdentitiesAppSetting()
 	{
 		this.editor = null;
 		this.defautOptionsAfterRender = Utils.defautOptionsAfterRender;
@@ -100,7 +100,7 @@
 	 *
 	 * @return {string}
 	 */
-	SettingsIdentities.prototype.formattedAccountIdentity = function ()
+	IdentitiesAppSetting.prototype.formattedAccountIdentity = function ()
 	{
 		var
 			sDisplayName = this.displayName.peek(),
@@ -110,20 +110,20 @@
 		return '' === sDisplayName ? sEmail : '"' + Utils.quoteName(sDisplayName) + '" <' + sEmail + '>';
 	};
 
-	SettingsIdentities.prototype.addNewIdentity = function ()
+	IdentitiesAppSetting.prototype.addNewIdentity = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:Identity'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Identity'));
 	};
 
-	SettingsIdentities.prototype.editIdentity = function (oIdentity)
+	IdentitiesAppSetting.prototype.editIdentity = function (oIdentity)
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:Identity'), [oIdentity]);
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Identity'), [oIdentity]);
 	};
 
 	/**
 	 * @param {IdentityModel} oIdentityToRemove
 	 */
-	SettingsIdentities.prototype.deleteIdentity = function (oIdentityToRemove)
+	IdentitiesAppSetting.prototype.deleteIdentity = function (oIdentityToRemove)
 	{
 		if (oIdentityToRemove && oIdentityToRemove.deleteAccess())
 		{
@@ -140,13 +140,13 @@
 				this.identities.remove(fRemoveFolder);
 
 				Remote.identityDelete(function () {
-					require('App:RainLoop').accountsAndIdentities();
+					require('App/App').accountsAndIdentities();
 				}, oIdentityToRemove.id);
 			}
 		}
 	};
 
-	SettingsIdentities.prototype.onFocus = function ()
+	IdentitiesAppSetting.prototype.onFocus = function ()
 	{
 		if (!this.editor && this.signatureDom())
 		{
@@ -172,7 +172,7 @@
 		}
 	};
 
-	SettingsIdentities.prototype.onBuild = function (oDom)
+	IdentitiesAppSetting.prototype.onBuild = function (oDom)
 	{
 		var self = this;
 
@@ -228,6 +228,6 @@
 		}, 50);
 	};
 
-	module.exports = SettingsIdentities;
+	module.exports = IdentitiesAppSetting;
 
 }());

dev/Settings/App/Identity.js

@@ -11,14 +11,14 @@
 		Utils = require('Common/Utils'),
 		HtmlEditor = require('Common/HtmlEditor'),
 
-		Data = require('Storage:RainLoop:Data'),
-		Remote = require('Storage:RainLoop:Remote')
+		Data = require('Storage/App/Data'),
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsIdentity()
+	function IdentityAppSetting()
 	{
 		this.editor = null;
 
@@ -34,7 +34,7 @@
 		this.signatureTrigger = ko.observable(Enums.SaveSettingsStep.Idle);
 	}
 
-	SettingsIdentity.prototype.onFocus = function ()
+	IdentityAppSetting.prototype.onFocus = function ()
 	{
 		if (!this.editor && this.signatureDom())
 		{
@@ -60,7 +60,7 @@
 		}
 	};
 
-	SettingsIdentity.prototype.onBuild = function ()
+	IdentityAppSetting.prototype.onBuild = function ()
 	{
 		var self = this;
 		_.delay(function () {
@@ -98,6 +98,6 @@
 		}, 50);
 	};
 
-	module.exports = SettingsIdentity;
+	module.exports = IdentityAppSetting;
 
 }());

dev/Settings/App/OpenPGP.js

@@ -6,15 +6,15 @@
 	var
 		ko = require('ko'),
 
-		kn = require('App:Knoin'),
+		kn = require('Knoin/Knoin'),
 
-		Data = require('Storage:RainLoop:Data')
+		Data = require('Storage/App/Data')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsOpenPGP()
+	function OpenPGPAppSetting()
 	{
 		this.openpgpkeys = Data.openpgpkeys;
 		this.openpgpkeysPublic = Data.openpgpkeysPublic;
@@ -35,28 +35,28 @@
 		]});
 	}
 
-	SettingsOpenPGP.prototype.addOpenPgpKey = function ()
+	OpenPGPAppSetting.prototype.addOpenPgpKey = function ()
 	{
-		kn.showScreenPopup(require('View:Popup:AddOpenPgpKey'));
+		kn.showScreenPopup(require('View/Popup/AddOpenPgpKey'));
 	};
 
-	SettingsOpenPGP.prototype.generateOpenPgpKey = function ()
+	OpenPGPAppSetting.prototype.generateOpenPgpKey = function ()
 	{
-		kn.showScreenPopup(require('View:Popup:NewOpenPgpKey'));
+		kn.showScreenPopup(require('View/Popup/NewOpenPgpKey'));
 	};
 
-	SettingsOpenPGP.prototype.viewOpenPgpKey = function (oOpenPgpKey)
+	OpenPGPAppSetting.prototype.viewOpenPgpKey = function (oOpenPgpKey)
 	{
 		if (oOpenPgpKey)
 		{
-			kn.showScreenPopup(require('View:Popup:ViewOpenPgpKey'), [oOpenPgpKey]);
+			kn.showScreenPopup(require('View/Popup/ViewOpenPgpKey'), [oOpenPgpKey]);
 		}
 	};
 
 	/**
 	 * @param {OpenPgpKeyModel} oOpenPgpKeyToRemove
 	 */
-	SettingsOpenPGP.prototype.deleteOpenPgpKey = function (oOpenPgpKeyToRemove)
+	OpenPGPAppSetting.prototype.deleteOpenPgpKey = function (oOpenPgpKeyToRemove)
 	{
 		if (oOpenPgpKeyToRemove && oOpenPgpKeyToRemove.deleteAccess())
 		{
@@ -73,11 +73,11 @@
 
 				Data.openpgpKeyring.store();
 
-				require('App:RainLoop').reloadOpenPgpKeys();
+				require('App/App').reloadOpenPgpKeys();
 			}
 		}
 	};
 
-	module.exports = SettingsOpenPGP;
+	module.exports = OpenPGPAppSetting;
 
 }());

dev/Settings/App/Security.js

@@ -10,13 +10,13 @@
 		Globals = require('Common/Globals'),
 		Utils = require('Common/Utils'),
 
-		Remote = require('Storage:RainLoop:Remote')
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsSecurity()
+	function SecurityAppSetting()
 	{
 		this.processing = ko.observable(false);
 		this.clearing = ko.observable(false);
@@ -46,37 +46,37 @@
 		this.onSecretResult = _.bind(this.onSecretResult, this);
 	}
 
-	SettingsSecurity.prototype.showSecret = function ()
+	SecurityAppSetting.prototype.showSecret = function ()
 	{
 		this.secreting(true);
 		Remote.showTwoFactorSecret(this.onSecretResult);
 	};
 
-	SettingsSecurity.prototype.hideSecret = function ()
+	SecurityAppSetting.prototype.hideSecret = function ()
 	{
 		this.viewSecret('');
 		this.viewBackupCodes('');
 		this.viewUrl('');
 	};
 
-	SettingsSecurity.prototype.createTwoFactor = function ()
+	SecurityAppSetting.prototype.createTwoFactor = function ()
 	{
 		this.processing(true);
 		Remote.createTwoFactor(this.onResult);
 	};
 
-	SettingsSecurity.prototype.enableTwoFactor = function ()
+	SecurityAppSetting.prototype.enableTwoFactor = function ()
 	{
 		this.processing(true);
 		Remote.enableTwoFactor(this.onResult, this.viewEnable());
 	};
 
-	SettingsSecurity.prototype.testTwoFactor = function ()
+	SecurityAppSetting.prototype.testTwoFactor = function ()
 	{
-		require('App:Knoin').showScreenPopup(require('View:Popup:TwoFactorTest'));
+		require('Knoin/Knoin').showScreenPopup(require('View/Popup/TwoFactorTest'));
 	};
 
-	SettingsSecurity.prototype.clearTwoFactor = function ()
+	SecurityAppSetting.prototype.clearTwoFactor = function ()
 	{
 		this.viewSecret('');
 		this.viewBackupCodes('');
@@ -86,14 +86,14 @@
 		Remote.clearTwoFactor(this.onResult);
 	};
 
-	SettingsSecurity.prototype.onShow = function ()
+	SecurityAppSetting.prototype.onShow = function ()
 	{
 		this.viewSecret('');
 		this.viewBackupCodes('');
 		this.viewUrl('');
 	};
 
-	SettingsSecurity.prototype.onResult = function (sResult, oData)
+	SecurityAppSetting.prototype.onResult = function (sResult, oData)
 	{
 		this.processing(false);
 		this.clearing(false);
@@ -139,7 +139,7 @@
 		}
 	};
 
-	SettingsSecurity.prototype.onSecretResult = function (sResult, oData)
+	SecurityAppSetting.prototype.onSecretResult = function (sResult, oData)
 	{
 		this.secreting(false);
 
@@ -155,12 +155,12 @@
 		}
 	};
 
-	SettingsSecurity.prototype.onBuild = function ()
+	SecurityAppSetting.prototype.onBuild = function ()
 	{
 		this.processing(true);
 		Remote.getTwoFactor(this.onResult);
 	};
 
-	module.exports = SettingsSecurity;
+	module.exports = SecurityAppSetting;
 
 }());

dev/Settings/App/Social.js

@@ -6,11 +6,11 @@
 	/**
 	 * @constructor
 	 */
-	function SettingsSocial()
+	function SocialAppSetting()
 	{
 		var
 			Utils = require('Common/Utils'),
-			Data = require('Storage:RainLoop:Data')
+			Data = require('Storage/App/Data')
 		;
 
 		this.googleEnable = Data.googleEnable;
@@ -34,43 +34,43 @@
 		this.connectGoogle = Utils.createCommand(this, function () {
 			if (!this.googleLoggined())
 			{
-				require('App:RainLoop').googleConnect();
+				require('App/App').googleConnect();
 			}
 		}, function () {
 			return !this.googleLoggined() && !this.googleActions();
 		});
 
 		this.disconnectGoogle = Utils.createCommand(this, function () {
-			require('App:RainLoop').googleDisconnect();
+			require('App/App').googleDisconnect();
 		});
 
 		this.connectFacebook = Utils.createCommand(this, function () {
 			if (!this.facebookLoggined())
 			{
-				require('App:RainLoop').facebookConnect();
+				require('App/App').facebookConnect();
 			}
 		}, function () {
 			return !this.facebookLoggined() && !this.facebookActions();
 		});
 
 		this.disconnectFacebook = Utils.createCommand(this, function () {
-			require('App:RainLoop').facebookDisconnect();
+			require('App/App').facebookDisconnect();
 		});
 
 		this.connectTwitter = Utils.createCommand(this, function () {
 			if (!this.twitterLoggined())
 			{
-				require('App:RainLoop').twitterConnect();
+				require('App/App').twitterConnect();
 			}
 		}, function () {
 			return !this.twitterLoggined() && !this.twitterActions();
 		});
 
 		this.disconnectTwitter = Utils.createCommand(this, function () {
-			require('App:RainLoop').twitterDisconnect();
+			require('App/App').twitterDisconnect();
 		});
 	}
 
-	module.exports = SettingsSocial;
+	module.exports = SocialAppSetting;
 
 }());

dev/Settings/App/Themes.js

@@ -13,14 +13,14 @@
 		Utils = require('Common/Utils'),
 		LinkBuilder = require('Common/LinkBuilder'),
 
-		Data = require('Storage:RainLoop:Data'),
-		Remote = require('Storage:RainLoop:Remote')
+		Data = require('Storage/App/Data'),
+		Remote = require('Storage/App/Remote')
 	;
 
 	/**
 	 * @constructor
 	 */
-	function SettingsThemes()
+	function ThemesAppSetting()
 	{
 		var self = this;
 
@@ -114,7 +114,7 @@
 		}, this);
 	}
 
-	SettingsThemes.prototype.onBuild = function ()
+	ThemesAppSetting.prototype.onBuild = function ()
 	{
 		var sCurrentTheme = Data.theme();
 		this.themesObjects(_.map(Data.themes(), function (sTheme) {
@@ -127,6 +127,6 @@
 		}));
 	};
 
-	module.exports = SettingsThemes;
+	module.exports = ThemesAppSetting;
 
 }());