Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code refactoring

Browse source 
Fixed languages popup
Release commit
This commit is contained in:
RainLoop Team 2014-09-02 04:15:31 +04:00
parent fa795947cf
commit ccbf04cb67
123 changed files with 1375 additions and 5128 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/ViewModels/Popups/PopupsActivateViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
@ -104,7 +104,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsActivateViewModel', PopupsActivateViewModel);
kn.extendAsViewModel(['View:Popup:Activate', 'PopupsActivateViewModel'], PopupsActivateViewModel);
_.extend(PopupsActivateViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsActivateViewModel.prototype.onShow = function ()
{

6
dev/ViewModels/Popups/PopupsAddAccountViewModel.js
View file

@ -1,9 +1,8 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
@ -87,7 +86,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsAddAccountViewModel', PopupsAddAccountViewModel);
kn.extendAsViewModel(['View:Popup:AddAccount', 'PopupsAddAccountViewModel'], PopupsAddAccountViewModel);
_.extend(PopupsAddAccountViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsAddAccountViewModel.prototype.clearPopup = function ()
{

5
dev/ViewModels/Popups/PopupsAddOpenPgpKeyViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Utils = require('Utils'),
@ -86,7 +86,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsAddOpenPgpKeyViewModel', PopupsAddOpenPgpKeyViewModel);
kn.extendAsViewModel(['View:Popup:AddOpenPgpKey', 'PopupsAddOpenPgpKeyViewModel'], PopupsAddOpenPgpKeyViewModel);
_.extend(PopupsAddOpenPgpKeyViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsAddOpenPgpKeyViewModel.prototype.clearPopup = function ()
{

7
dev/ViewModels/Popups/PopupsAdvancedSearchViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
moment = require('moment'),
@ -50,7 +50,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsAdvancedSearchViewModel', PopupsAdvancedSearchViewModel);
kn.extendAsViewModel(['View:Popup:AdvancedSearch', 'PopupsAdvancedSearchViewModel'], PopupsAdvancedSearchViewModel);
_.extend(PopupsAdvancedSearchViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsAdvancedSearchViewModel.prototype.buildSearchStringValue = function (sValue)
{

7
dev/ViewModels/Popups/PopupsAskViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
key = require('key'),
@ -39,7 +39,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsAskViewModel', PopupsAskViewModel);
kn.extendAsViewModel(['View:Popup:Ask', 'PopupsAskViewModel'], PopupsAskViewModel);
_.extend(PopupsAskViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsAskViewModel.prototype.clearPopup = function ()
{

6
dev/ViewModels/Popups/PopupsComposeOpenPgpViewModel.js
View file

@ -1,9 +1,8 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
window = require('window'),
_ = require('_'),
@ -159,7 +158,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsComposeOpenPgpViewModel', PopupsComposeOpenPgpViewModel);
kn.extendAsViewModel(['View:Popup:ComposeOpenPgp', 'PopupsComposeOpenPgpViewModel'], PopupsComposeOpenPgpViewModel);
_.extend(PopupsComposeOpenPgpViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsComposeOpenPgpViewModel.prototype.clearPopup = function ()
{

18
dev/ViewModels/Popups/PopupsComposeViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -6,8 +5,8 @@
var
window = require('window'),
$ = require('$'),
_ = require('_'),
$ = require('$'),
ko = require('ko'),
moment = require('moment'),
JSON = require('JSON'),
@ -17,8 +16,8 @@
Consts = require('Consts'),
Utils = require('Utils'),
Globals = require('Globals'),
LinkBuilder = require('LinkBuilder'),
Events = require('Events'),
LinkBuilder = require('LinkBuilder'),
HtmlEditor = require('HtmlEditor'),
Settings = require('Storage:Settings'),
@ -404,7 +403,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsComposeViewModel', PopupsComposeViewModel);
kn.extendAsViewModel(['View:Popup:Compose', 'PopupsComposeViewModel'], PopupsComposeViewModel);
_.extend(PopupsComposeViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsComposeViewModel.prototype.emailsSource = function (oData, fResponse)
{
@ -794,7 +794,15 @@
aDraftInfo = oMessage.aDraftInfo;
oText = $(oMessage.body).clone();
Utils.removeBlockquoteSwitcher(oText);
if (oText)
{
oText.find('blockquote.rl-bq-switcher').each(function () {
$(this).removeClass('rl-bq-switcher hidden-bq');
});
oText.find('.rlBlockquoteSwitcher').each(function () {
$(this).remove();
});
}
oText.find('[data-html-editor-font-wrapper]').removeAttr('data-html-editor-font-wrapper');
sText = oText.html();

8
dev/ViewModels/Popups/PopupsContactsViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -6,8 +5,8 @@
var
window = require('window'),
$ = require('$'),
_ = require('_'),
$ = require('$'),
ko = require('ko'),
key = require('key'),
@ -15,8 +14,8 @@
Consts = require('Consts'),
Globals = require('Globals'),
Utils = require('Utils'),
LinkBuilder = require('LinkBuilder'),
Selector = require('Selector'),
LinkBuilder = require('LinkBuilder'),
Data = require('Storage:RainLoop:Data'),
Remote = require('Storage:RainLoop:Remote'),
@ -391,7 +390,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsContactsViewModel', PopupsContactsViewModel);
kn.extendAsViewModel(['View:Popup:Contacts', 'PopupsContactsViewModel'], PopupsContactsViewModel);
_.extend(PopupsContactsViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsContactsViewModel.prototype.contactTagsSource = function (oData, fResponse)
{

6
dev/ViewModels/Popups/PopupsDomainViewModel.js
View file

@ -1,7 +1,6 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
@ -200,7 +199,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsDomainViewModel', PopupsDomainViewModel);
kn.extendAsViewModel(['View:Popup:Domain', 'PopupsDomainViewModel'], PopupsDomainViewModel);
_.extend(PopupsDomainViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsDomainViewModel.prototype.onTestConnectionResponse = function (sResult, oData)
{

5
dev/ViewModels/Popups/PopupsFilterViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Consts = require('Consts'),
@ -33,7 +33,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsFilterViewModel', PopupsFilterViewModel);
kn.extendAsViewModel(['View:Popup:Filter', 'PopupsFilterViewModel'], PopupsFilterViewModel);
_.extend(PopupsFilterViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsFilterViewModel.prototype.clearPopup = function ()
{

7
dev/ViewModels/Popups/PopupsFolderClearViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
@ -64,7 +64,7 @@
oFolderToClear.messageCountUnread(0);
Cache.setFolderHash(oFolderToClear.fullNameRaw, '');
Remote.folderClear(function (sResult, oData) {
self.clearingProcess(false);
@ -101,7 +101,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsFolderClearViewModel', PopupsFolderClearViewModel);
kn.extendAsViewModel(['View:Popup:FolderClear', 'PopupsFolderClearViewModel'], PopupsFolderClearViewModel);
_.extend(PopupsFolderClearViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsFolderClearViewModel.prototype.clearPopup = function ()
{

7
dev/ViewModels/Popups/PopupsFolderCreateViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
@ -100,7 +100,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsFolderCreateViewModel', PopupsFolderCreateViewModel);
kn.extendAsViewModel(['View:Popup:FolderCreate', 'PopupsFolderCreateViewModel'], PopupsFolderCreateViewModel);
_.extend(PopupsFolderCreateViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsFolderCreateViewModel.prototype.sNoParentText = '';

7
dev/ViewModels/Popups/PopupsFolderSystemViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
@ -94,7 +94,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsFolderSystemViewModel', PopupsFolderSystemViewModel);
kn.extendAsViewModel(['View:Popup:FolderSystem', 'PopupsFolderSystemViewModel'], PopupsFolderSystemViewModel);
_.extend(PopupsFolderSystemViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsFolderSystemViewModel.prototype.sChooseOnText = '';
PopupsFolderSystemViewModel.prototype.sUnuseText = '';

7
dev/ViewModels/Popups/PopupsIdentityViewModel.js
View file

@ -1,19 +1,19 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
Utils = require('Utils'),
kn = require('App:Knoin'),
Remote = require('Storage:RainLoop:Remote'),
Data = require('Storage:RainLoop:Data'),
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
;
@ -115,7 +115,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsIdentityViewModel', PopupsIdentityViewModel);
kn.extendAsViewModel(['View:Popup:Identity', 'PopupsIdentityViewModel'], PopupsIdentityViewModel);
_.extend(PopupsIdentityViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsIdentityViewModel.prototype.clearPopup = function ()
{

4
dev/ViewModels/Popups/PopupsKeyboardShortcutsHelpViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -27,7 +26,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsKeyboardShortcutsHelpViewModel', PopupsKeyboardShortcutsHelpViewModel);
kn.extendAsViewModel(['View:Popup:KeyboardShortcutsHelp', 'PopupsKeyboardShortcutsHelpViewModel'], PopupsKeyboardShortcutsHelpViewModel);
_.extend(PopupsKeyboardShortcutsHelpViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsKeyboardShortcutsHelpViewModel.prototype.onBuild = function (oDom)
{

19
dev/ViewModels/Popups/PopupsLanguagesViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -9,8 +8,7 @@
ko = require('ko'),
Utils = require('Utils'),
Data = require('Storage:RainLoop:Data'),
Globals = require('Globals'),
kn = require('App:Knoin'),
KnoinAbstractViewModel = require('Knoin:AbstractViewModel')
@ -24,26 +22,29 @@
{
KnoinAbstractViewModel.call(this, 'Popups', 'PopupsLanguages');
this.Data = Globals.__APP.data(); // TODO
this.exp = ko.observable(false);
this.languages = ko.computed(function () {
return _.map(Data.languages(), function (sLanguage) {
return _.map(this.Data.languages(), function (sLanguage) {
return {
'key': sLanguage,
'selected': ko.observable(false),
'fullName': Utils.convertLangName(sLanguage)
};
});
});
}, this);
Data.mainLanguage.subscribe(function () {
this.Data.mainLanguage.subscribe(function () {
this.resetMainLanguage();
}, this);
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsLanguagesViewModel', PopupsLanguagesViewModel);
kn.extendAsViewModel(['View:Popup:Languages', 'PopupsLanguagesViewModel'], PopupsLanguagesViewModel);
_.extend(PopupsLanguagesViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsLanguagesViewModel.prototype.languageEnName = function (sLanguage)
{
@ -52,7 +53,7 @@
PopupsLanguagesViewModel.prototype.resetMainLanguage = function ()
{
var sCurrent = Data.mainLanguage();
var sCurrent = this.Data.mainLanguage();
_.each(this.languages(), function (oItem) {
oItem['selected'](oItem['key'] === sCurrent);
});
@ -72,7 +73,7 @@
PopupsLanguagesViewModel.prototype.changeLanguage = function (sLang)
{
Data.mainLanguage(sLang);
this.Data.mainLanguage(sLang);
this.cancelCommand();
};

4
dev/ViewModels/Popups/PopupsNewOpenPgpKeyViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -89,7 +88,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsNewOpenPgpKeyViewModel', PopupsNewOpenPgpKeyViewModel);
kn.extendAsViewModel(['View:Popup:NewOpenPgpKey', 'PopupsNewOpenPgpKeyViewModel'], PopupsNewOpenPgpKeyViewModel);
_.extend(PopupsNewOpenPgpKeyViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsNewOpenPgpKeyViewModel.prototype.clearPopup = function ()
{

4
dev/ViewModels/Popups/PopupsPluginViewModel.js
View file

@ -1,4 +1,3 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
@ -85,7 +84,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsPluginViewModel', PopupsPluginViewModel);
kn.extendAsViewModel(['View:Popup:Plugin', 'PopupsPluginViewModel'], PopupsPluginViewModel);
_.extend(PopupsPluginViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsPluginViewModel.prototype.onPluginSettingsUpdateResponse = function (sResult, oData)
{

5
dev/ViewModels/Popups/PopupsTwoFactorTestViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Enums = require('Enums'),
@ -50,7 +50,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsTwoFactorTestViewModel', PopupsTwoFactorTestViewModel);
kn.extendAsViewModel(['View:Popup:TwoFactorTest', 'PopupsTwoFactorTestViewModel'], PopupsTwoFactorTestViewModel);
_.extend(PopupsTwoFactorTestViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsTwoFactorTestViewModel.prototype.clearPopup = function ()
{

5
dev/ViewModels/Popups/PopupsViewOpenPgpKeyViewModel.js
View file

@ -1,10 +1,10 @@
/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
(function (module, require) {
'use strict';
var
_ = require('_'),
ko = require('ko'),
Utils = require('Utils'),
@ -27,7 +27,8 @@
kn.constructorEnd(this);
}
kn.extendAsViewModel('PopupsViewOpenPgpKeyViewModel', PopupsViewOpenPgpKeyViewModel);
kn.extendAsViewModel(['View:Popup:ViewOpenPgpKey', 'PopupsViewOpenPgpKeyViewModel'], PopupsViewOpenPgpKeyViewModel);
_.extend(PopupsViewOpenPgpKeyViewModel.prototype, KnoinAbstractViewModel.prototype);
PopupsViewOpenPgpKeyViewModel.prototype.clearPopup = function ()
{