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

Small fixes

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-10-05 22:37:31 +04:00
parent 78f09856e3
commit c26ab305a1
29 changed files with 385 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/View/App/AbstractSystemDropDown.js
View file

@ -4,14 +4,13 @@
'use strict';
var
window = require('window'),
_ = require('_'),
ko = require('ko'),
key = require('key'),
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Settings = require('Storage/Settings'),
Data = require('Storage/App/Data'),
@ -34,7 +33,7 @@
this.accountMenuDropdownTrigger = ko.observable(false);
this.capaAdditionalAccounts = Settings.capa(Enums.Capa.AdditionalAccounts);
this.capaAdditionalAccounts = ko.observable(Settings.capa(Enums.Capa.AdditionalAccounts));
this.loading = ko.computed(function () {
return this.accountsLoading();
@ -66,7 +65,7 @@
AbstractSystemDropDownAppView.prototype.settingsClick = function ()
{
require('Knoin/Knoin').setHash(LinkBuilder.settings());
require('Knoin/Knoin').setHash(Links.settings());
};
AbstractSystemDropDownAppView.prototype.settingsHelp = function ()
@ -76,7 +75,7 @@
AbstractSystemDropDownAppView.prototype.addAccountClick = function ()
{
if (this.capaAdditionalAccounts)
if (this.capaAdditionalAccounts())
{
require('Knoin/Knoin').showScreenPopup(require('View/Popup/AddAccount'));
}
@ -85,11 +84,6 @@
AbstractSystemDropDownAppView.prototype.logoutClick = function ()
{
Remote.logout(function () {
if (window.__rlah_clear)
{
window.__rlah_clear();
}
require('App/App').loginAndLogoutReload(true,
Settings.settingsGet('ParentEmail') && 0 < Settings.settingsGet('ParentEmail').length);
});

8
dev/View/App/Login.js
View file

@ -11,7 +11,7 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Settings = require('Storage/Settings'),
Data = require('Storage/App/Data'),
@ -187,7 +187,7 @@
this.facebookCommand = Utils.createCommand(this, function () {
window.open(LinkBuilder.socialFacebook(), 'Facebook',
window.open(Links.socialFacebook(), 'Facebook',
'left=200,top=100,width=650,height=335,menubar=no,status=no,resizable=yes,scrollbars=yes');
return true;
@ -199,7 +199,7 @@
this.googleCommand = Utils.createCommand(this, function () {
window.open(LinkBuilder.socialGoogle(), 'Google',
window.open(Links.socialGoogle(), 'Google',
'left=200,top=100,width=650,height=335,menubar=no,status=no,resizable=yes,scrollbars=yes');
return true;
@ -211,7 +211,7 @@
this.twitterCommand = Utils.createCommand(this, function () {
window.open(LinkBuilder.socialTwitter(), 'Twitter',
window.open(Links.socialTwitter(), 'Twitter',
'left=200,top=100,width=650,height=335,menubar=no,status=no,resizable=yes,scrollbars=yes');
return true;

6
dev/View/App/MailBox/FolderList.js
View file

@ -13,7 +13,7 @@
Utils = require('Common/Utils'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Settings = require('Storage/Settings'),
Cache = require('Storage/App/Cache'),
@ -96,7 +96,7 @@
Cache.setFolderHash(oFolder.fullNameRaw, '');
}
kn.setHash(LinkBuilder.mailBox(oFolder.fullNameHash));
kn.setHash(Links.mailBox(oFolder.fullNameHash));
}
})
;
@ -258,7 +258,7 @@
FolderListMailBoxAppView.prototype.configureFolders = function ()
{
kn.setHash(LinkBuilder.settings('folders'));
kn.setHash(Links.settings('folders'));
};
FolderListMailBoxAppView.prototype.contactsClick = function ()

8
dev/View/App/MailBox/MessageList.js
View file

@ -15,7 +15,7 @@
Consts = require('Common/Consts'),
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Events = require('Common/Events'),
Selector = require('Common/Selector'),
@ -229,7 +229,7 @@
if (Enums.Layout.NoPreview === Data.layout())
{
kn.setHash(LinkBuilder.messagePreview(), true);
kn.setHash(Links.messagePreview(), true);
Data.message.focused(true);
}
}
@ -672,7 +672,7 @@
var oPage = ko.dataFor(this);
if (oPage)
{
kn.setHash(LinkBuilder.mailBox(
kn.setHash(Links.mailBox(
Data.currentFolderFullNameHash(),
oPage.value,
Data.messageListSearch()
@ -885,7 +885,7 @@
var
oJua = new Jua({
'action': LinkBuilder.append(),
'action': Links.append(),
'name': 'AppendFile',
'queueSize': 1,
'multipleSizeLimit': 1,

6
dev/View/App/Settings/Menu.js
View file

@ -7,7 +7,7 @@
_ = require('_'),
Globals = require('Common/Globals'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
kn = require('Knoin/Knoin'),
AbstractView = require('Knoin/AbstractView')
@ -35,12 +35,12 @@
MenuSettingsAppView.prototype.link = function (sRoute)
{
return LinkBuilder.settings(sRoute);
return Links.settings(sRoute);
};
MenuSettingsAppView.prototype.backToMailBoxClick = function ()
{
kn.setHash(LinkBuilder.inbox());
kn.setHash(Links.inbox());
};
module.exports = MenuSettingsAppView;

4
dev/View/App/Settings/Pane.js
View file

@ -8,7 +8,7 @@
key = require('key'),
Enums = require('Common/Enums'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Data = require('Storage/App/Data'),
@ -45,7 +45,7 @@
PaneSettingsAppView.prototype.backToMailBoxClick = function ()
{
kn.setHash(LinkBuilder.inbox());
kn.setHash(Links.inbox());
};
module.exports = PaneSettingsAppView;

4
dev/View/Popup/Compose.js
View file

@ -17,7 +17,7 @@
Utils = require('Common/Utils'),
Globals = require('Common/Globals'),
Events = require('Common/Events'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
HtmlEditor = require('Common/HtmlEditor'),
Settings = require('Storage/Settings'),
@ -1288,7 +1288,7 @@
oUploadCache = {},
iAttachmentSizeLimit = Utils.pInt(Settings.settingsGet('AttachmentLimit')),
oJua = new Jua({
'action': LinkBuilder.upload(),
'action': Links.upload(),
'name': 'uploader',
'queueSize': 2,
'multipleSizeLimit': 50,

8
dev/View/Popup/Contacts.js
View file

@ -15,7 +15,7 @@
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Selector = require('Common/Selector'),
LinkBuilder = require('Common/LinkBuilder'),
Links = require('Common/Links'),
Data = require('Storage/App/Data'),
Remote = require('Storage/App/Remote'),
@ -447,12 +447,12 @@
ContactsPopupView.prototype.exportVcf = function ()
{
require('App/App').download(LinkBuilder.exportContactsVcf());
require('App/App').download(Links.exportContactsVcf());
};
ContactsPopupView.prototype.exportCsv = function ()
{
require('App/App').download(LinkBuilder.exportContactsCsv());
require('App/App').download(Links.exportContactsCsv());
};
ContactsPopupView.prototype.initUploader = function ()
@ -461,7 +461,7 @@
{
var
oJua = new Jua({
'action': LinkBuilder.uploadContacts(),
'action': Links.uploadContacts(),
'name': 'uploader',
'queueSize': 1,
'multipleSizeLimit': 1,

4
dev/View/Popup/KeyboardShortcutsHelp.js
View file

@ -31,7 +31,7 @@
KeyboardShortcutsHelpPopupView.prototype.onBuild = function (oDom)
{
key('tab, shift+tab, left, right', Enums.KeyState.PopupKeyboardShortcutsHelp, _.bind(function (event, handler) {
key('tab, shift+tab, left, right', Enums.KeyState.PopupKeyboardShortcutsHelp, _.throttle(_.bind(function (event, handler) {
if (event && handler)
{
var
@ -56,7 +56,7 @@
$tabs.eq(iIndex).find('a[data-toggle="tab"]').tab('show');
return false;
}
}, this));
}, this), 100));
};
module.exports = KeyboardShortcutsHelpPopupView;