Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

New styles for toltips (Opentip)

Browse source 
Selector new functionality
x-script tag support for templates
This commit is contained in:
RainLoop Team 2015-04-01 22:18:15 +04:00
parent c1c817c837
commit 80c5e35a29
47 changed files with 2641 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

22
dev/Stores/User/App.js
View file

@ -6,6 +6,9 @@
var
ko = require('ko'),
Enums = require('Common/Enums'),
Globals = require('Common/Globals'),
Settings = require('Storage/Settings'),
AppStore = require('Stores/App')
@ -18,6 +21,25 @@
{
AppStore.call(this);
this.focusedState = ko.observable(Enums.Focused.None);
this.focusedState.subscribe(function (mValue) {
switch (mValue)
{
case Enums.Focused.MessageList:
Globals.keyScope(Enums.KeyState.MessageList);
break;
case Enums.Focused.MessageView:
Globals.keyScope(Enums.KeyState.MessageView);
break;
case Enums.Focused.FolderList:
Globals.keyScope(Enums.KeyState.FolderList);
break;
}
}, this);
this.projectHash = ko.observable('');
this.threadsAllowed = ko.observable(false);

13
dev/Stores/User/Folder.js
View file

@ -9,7 +9,6 @@
Enums = require('Common/Enums'),
Consts = require('Common/Consts'),
Globals = require('Common/Globals'),
Utils = require('Common/Utils'),
Cache = require('Common/Cache')
@ -29,7 +28,6 @@
this.namespace = '';
this.folderList = ko.observableArray([]);
this.folderList.focused = ko.observable(false);
this.folderList.optimized = ko.observable(false);
this.folderList.error = ko.observable('');
@ -180,17 +178,6 @@
this.spamFolder.subscribe(fSetSystemFolderType(Enums.FolderType.Spam), this);
this.trashFolder.subscribe(fSetSystemFolderType(Enums.FolderType.Trash), this);
this.archiveFolder.subscribe(fSetSystemFolderType(Enums.FolderType.Archive), this);
this.folderList.focused.subscribe(function (bValue) {
if (bValue)
{
Globals.keyScope(Enums.KeyState.FolderList);
}
else if (Enums.KeyState.FolderList === Globals.keyScope())
{
Globals.keyScope(Enums.KeyState.MessageList);
}
});
};
/**

57
dev/Stores/User/Message.js
View file

@ -61,8 +61,6 @@
this.selectorMessageSelected = ko.observable(null);
this.selectorMessageFocused = ko.observable(null);
this.message.focused = ko.observable(false);
this.message.viewTrigger = ko.observable(false);
this.messageLastThreadUidsData = ko.observable(null);
@ -180,41 +178,22 @@
}, 500));
this.message.subscribe(function (oMessage) {
if (!oMessage)
if (oMessage)
{
this.message.focused(false);
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
AppStore.focusedState(Enums.Focused.MessageView);
}
}
else
{
AppStore.focusedState(Enums.Focused.MessageList);
this.messageFullScreenMode(false);
this.hideMessageBodies();
}
if (Enums.Layout.NoPreview === SettingsStore.layout() &&
-1 < window.location.hash.indexOf('message-preview'))
{
require('App/User').historyBack();
}
}
else if (Enums.Layout.NoPreview === SettingsStore.layout())
{
this.message.focused(true);
}
}, this);
this.message.focused.subscribe(function (bValue) {
if (bValue)
{
FolderStore.folderList.focused(false);
Globals.keyScope(Enums.KeyState.MessageView);
}
else if (Enums.KeyState.MessageView === Globals.keyScope())
{
if (Enums.Layout.NoPreview === SettingsStore.layout() && this.message())
{
Globals.keyScope(Enums.KeyState.MessageView);
}
else
{
Globals.keyScope(Enums.KeyState.MessageList);
}
}
}, this);
this.messageLoading.subscribe(function (bValue) {
@ -671,12 +650,6 @@
this.message(this.staticMessage.populateByMessageListItem(oMessage));
this.populateMessageBody(this.message());
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
kn.setHash(Links.messagePreview(), true);
this.message.focused(true);
}
}
else
{
@ -690,12 +663,6 @@
{
this.messageThreadLoading(true);
}
if (Enums.Layout.NoPreview === SettingsStore.layout())
{
kn.setHash(Links.messagePreview(), true);
this.message.focused(true);
}
};
MessageUserStore.prototype.populateMessageBody = function (oMessage)