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

Move Knoin routOff, routOn, routReload & setHash to rl.route.*

Browse source
This commit is contained in:
djmaze 2020-09-16 20:35:29 +02:00
parent 03a40f3249
commit 467f615713
17 changed files with 83 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/App/Abstract.js
View file

@ -14,8 +14,6 @@ import { initOnStartOrLangChange, initNotificationLanguage } from 'Common/Transl
import LanguageStore from 'Stores/Language';
import ThemeStore from 'Stores/Theme';
import { routeReload } from 'Knoin/Knoin';
const Settings = rl.settings;
class AbstractApp {
@ -89,7 +87,7 @@ class AbstractApp {
if (location.href !== logoutLink) {
setTimeout(() => (Settings.app('inIframe') ? parent : window).location.href = logoutLink, 100);
} else {
routeReload();
rl.route.reload();
}
}

12
dev/App/Admin.js
View file

@ -1,6 +1,5 @@
import ko from 'ko';
import { root } from 'Common/Links';
import { StorageResultType } from 'Common/Enums';
import AppStore from 'Stores/Admin/App';
@ -13,7 +12,7 @@ import Remote from 'Remote/Admin/Fetch';
import { SettingsAdminScreen } from 'Screen/Admin/Settings';
import { LoginAdminScreen } from 'Screen/Admin/Login';
import { hideLoading, routeOff, setHash, startScreens } from 'Knoin/Knoin';
import { hideLoading, startScreens } from 'Knoin/Knoin';
import { AbstractApp } from 'App/Abstract';
class AdminApp extends AbstractApp {
@ -108,13 +107,8 @@ class AdminApp extends AbstractApp {
hideLoading();
if (!rl.settings.app('allowAdminPanel')) {
routeOff();
setHash(root(), true);
routeOff();
setTimeout(() =>
location.href = '/'
, 1);
rl.route.root();
setTimeout(() => location.href = '/', 1);
} else {
if (rl.settings.get('Auth')) {
startScreens([SettingsAdminScreen]);

8
dev/App/User.js
View file

@ -68,7 +68,7 @@ import { LoginUserScreen } from 'Screen/User/Login';
import { MailBoxUserScreen } from 'Screen/User/MailBox';
import { SettingsUserScreen } from 'Screen/User/Settings';
import { hideLoading, routeOff, routeOn, setHash, startScreens, showScreenPopup } from 'Knoin/Knoin';
import { hideLoading, startScreens, showScreenPopup } from 'Knoin/Knoin';
import { AbstractApp } from 'App/Abstract';
@ -149,7 +149,7 @@ class AppUser extends AbstractApp {
MessageStore.messageListPageBeforeThread(1);
iOffset = 0;
setHash(
rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
MessageStore.messageListPage(),
@ -948,9 +948,7 @@ class AppUser extends AbstractApp {
if (value) {
if (startupUrl) {
routeOff();
setHash(root(startupUrl), true);
routeOn();
rl.route.setHash(root(startupUrl), true);
}
if (window.crypto && crypto.getRandomValues && Settings.capa(Capa.OpenPGP)) {

50
dev/Knoin/Knoin.js
View file

@ -2,8 +2,6 @@ import ko from 'ko';
import { $htmlCL, VIEW_MODELS } from 'Common/Globals';
import { root } from 'Common/Links';
//import { bMobileDevice } from 'Common/Globals';
let currentScreen = null,
@ -82,30 +80,6 @@ export function addSettingsViewModel(SettingsViewModelClass, template, labelName
VIEW_MODELS.settings.push(SettingsViewModelClass);
}
/**
* @returns {void}
*/
export function routeReload() {
routeOff();
setHash(root(), true);
routeOff();
setTimeout(() => (rl.settings.app('inIframe') ? parent : window).location.reload(), 100);
}
/**
* @returns {void}
*/
export function routeOff() {
hasher.changed.active = false;
}
/**
* @returns {void}
*/
export function routeOn() {
hasher.changed.active = true;
}
/**
* @param {string} screenName
* @returns {?Object}
@ -422,28 +396,6 @@ export function startScreens(screensClasses) {
setTimeout(() => $htmlCL.add('rl-started-delay'), 200);
}
/**
* @param {string} sHash
* @param {boolean=} silence = false
* @param {boolean=} replace = false
* @returns {void}
*/
export function setHash(hash, silence = false, replace = false) {
hash = hash.replace(/^[#/]+/, '');
const cmd = replace ? 'replaceHash' : 'setHash';
if (silence) {
hasher.changed.active = false;
hasher[cmd](hash);
hasher.changed.active = true;
} else {
hasher.changed.active = true;
hasher[cmd](hash);
hasher.setHash(hash);
}
}
/**
* @param {Object} params
* @returns {Function}
@ -524,7 +476,7 @@ function settingsMenuKeysHandler(items) {
}
const resultHash = items[index].href;
resultHash && setHash(resultHash, false, true);
resultHash && rl.route.setHash(resultHash, false, true);
}
}).throttle(200);
}

3
dev/Screen/AbstractSettings.js
View file

@ -4,7 +4,6 @@ import { VIEW_MODELS } from 'Common/Globals';
import { pString } from 'Common/Utils';
import { settings } from 'Common/Links';
import { setHash } from 'Knoin/Knoin';
import { AbstractScreen } from 'Knoin/AbstractScreen';
class AbstractSettingsScreen extends AbstractScreen {
@ -128,7 +127,7 @@ class AbstractSettingsScreen extends AbstractScreen {
}, 1);
}
} else {
setHash(settings(), false, true);
rl.route.setHash(settings(), false, true);
}
}

8
dev/Settings/User/Accounts.js
View file

@ -1,13 +1,12 @@
import ko from 'ko';
import { Capa, StorageResultType } from 'Common/Enums';
import { root } from 'Common/Links';
import AccountStore from 'Stores/User/Account';
import IdentityStore from 'Stores/User/Identity';
import Remote from 'Remote/User/Fetch';
import { showScreenPopup, routeOff, setHash } from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
class AccountsUserSettings {
constructor() {
@ -59,10 +58,7 @@ class AccountsUserSettings {
Remote.accountDelete((result, data) => {
if (StorageResultType.Success === result && data && data.Result && data.Reload) {
routeOff();
setHash(root(), true);
routeOff();
rl.route.root();
setTimeout(() => location.reload(), 1);
} else {
rl.app.accountsAndIdentities();

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

@ -29,8 +29,6 @@ import { EmailCollectionModel } from 'Model/EmailCollection';
import { MessageModel } from 'Model/Message';
import { MessageCollectionModel } from 'Model/MessageCollection';
import { setHash } from 'Knoin/Knoin';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import FolderStore from 'Stores/User/Folder';
@ -127,7 +125,7 @@ class MessageUserStore {
this.mainMessageListSearch = ko.computed({
read: this.messageListSearch,
write: (value) => {
setHash(
rl.route.setHash(
mailBox(FolderStore.currentFolderFullNameHash(), 1, value.toString().trim(), this.messageListThreadUid())
);
}
@ -374,7 +372,7 @@ class MessageUserStore {
if (message && this.messageListThreadUid() !== pString(message.uid)) {
this.messageListThreadUid(pString(message.uid));
setHash(
rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
this.messageListPage(),
@ -388,7 +386,7 @@ class MessageUserStore {
if (1 < this.messageListPage()) {
this.messageListPage(this.messageListPage() - 1);
setHash(
rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
this.messageListPage(),
@ -401,7 +399,7 @@ class MessageUserStore {
} else {
this.messageListThreadUid('');
setHash(
rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
this.messageListPageBeforeThread(),

6
dev/View/Admin/Login.js
View file

@ -5,7 +5,7 @@ import { getNotification } from 'Common/Translator';
import Remote from 'Remote/Admin/Fetch';
import { view, command, ViewType, routeOff, routeReload } from 'Knoin/Knoin';
import { view, command, ViewType } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
@view({
@ -68,7 +68,7 @@ class LoginAdminView extends AbstractViewNext {
(sResult, oData) => {
if (StorageResultType.Success === sResult && oData && 'AdminLogin' === oData.Action) {
if (oData.Result) {
routeReload();
rl.route.reload();
} else if (oData.ErrorCode) {
this.submitRequest(false);
this.submitError(getNotification(oData.ErrorCode));
@ -86,7 +86,7 @@ class LoginAdminView extends AbstractViewNext {
}
onShow() {
routeOff();
rl.route.off();
}
submitForm() {

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

@ -40,7 +40,7 @@ import Remote from 'Remote/User/Fetch';
import { ComposeAttachmentModel } from 'Model/ComposeAttachment';
import { popup, command, isPopupVisible, showScreenPopup, hideScreenPopup, routeOn, routeOff } from 'Knoin/Knoin';
import { popup, command, isPopupVisible, showScreenPopup, hideScreenPopup } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const Settings = rl.settings;
@ -636,7 +636,7 @@ class ComposePopupView extends AbstractViewNext {
this.to.focused(false);
routeOn();
rl.route.on();
this.resizeObserver.disconnect();
}
@ -719,7 +719,7 @@ class ComposePopupView extends AbstractViewNext {
* @param {string=} sCustomPlainText = null
*/
onShow(type, oMessageOrArray, aToEmails, aCcEmails, aBccEmails, sCustomSubject, sCustomPlainText) {
routeOff();
rl.route.off();
const ro = this.resizeObserver;
ro.observe(ro.compose);

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

@ -33,7 +33,7 @@ import { EmailModel } from 'Model/Email';
import { ContactModel } from 'Model/Contact';
import { ContactPropertyModel } from 'Model/ContactProperty';
import { popup, command, showScreenPopup, hideScreenPopup, routeOn, routeOff } from 'Knoin/Knoin';
import { popup, command, showScreenPopup, hideScreenPopup } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const trim = text => null == text ? "" : (text + "").trim();
@ -633,12 +633,12 @@ class ContactsPopupView extends AbstractViewNext {
this.bBackToCompose = undefined === bBackToCompose ? false : !!bBackToCompose;
this.sLastComposeFocusedField = undefined === sLastComposeFocusedField ? '' : sLastComposeFocusedField;
routeOff();
rl.route.off();
this.reloadContactList(true);
}
onHide() {
routeOn();
rl.route.on();
this.currentContact(null);
this.emptySelection(true);

4
dev/View/User/AbstractSystemDropDown.js
View file

@ -7,7 +7,7 @@ import MessageStore from 'Stores/User/Message';
import { Capa, KeyState } from 'Common/Enums';
import { settings } from 'Common/Links';
import { showScreenPopup, setHash } from 'Knoin/Knoin';
import { showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const Settings = rl.settings;
@ -60,7 +60,7 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
settingsClick() {
if (Settings.capa(Capa.Settings)) {
setHash(settings());
rl.route.setHash(settings());
}
}

6
dev/View/User/Login.js
View file

@ -19,7 +19,7 @@ import * as Local from 'Storage/Client';
import Remote from 'Remote/User/Fetch';
import { view, command, ViewType, routeOff, showScreenPopup, routeReload } from 'Knoin/Knoin';
import { view, command, ViewType, showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
import { rootAdmin } from 'Common/Links';
@ -182,7 +182,7 @@ class LoginUserView extends AbstractViewNext {
} else if (oData.Admin) {
setTimeout(() => location.href = rootAdmin(), 100);
} else {
routeReload();
rl.route.reload();
}
} else if (oData.ErrorCode) {
this.submitRequest(false);
@ -227,7 +227,7 @@ class LoginUserView extends AbstractViewNext {
}
onShow() {
routeOff();
rl.route.off();
}
onBuild() {

13
dev/View/User/MailBox/FolderList.js
View file

@ -10,7 +10,7 @@ import SettingsStore from 'Stores/User/Settings';
import FolderStore from 'Stores/User/Folder';
import MessageStore from 'Stores/User/Message';
import { view, ViewType, showScreenPopup, setHash } from 'Knoin/Knoin';
import { view, ViewType, showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const Settings = rl.settings;
@ -90,11 +90,10 @@ class FolderListMailBoxUserView extends AbstractViewNext {
setFolderHash(folder.fullNameRaw, '');
}
if (starred) {
setHash(mailBox(folder.fullNameHash, 1, 'is:flagged'));
} else {
setHash(mailBox(folder.fullNameHash));
}
rl.route.setHash(starred
? mailBox(folder.fullNameHash, 1, 'is:flagged')
: mailBox(folder.fullNameHash)
);
}
AppStore.focusedState(Focused.MessageList);
@ -245,7 +244,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
}
configureFolders() {
setHash(settings('folders'));
rl.route.setHash(settings('folders'));
}
contactsClick() {

14
dev/View/User/MailBox/MessageList.js
View file

@ -37,7 +37,7 @@ import MessageStore from 'Stores/User/Message';
import Remote from 'Remote/User/Fetch';
import { view, command, ViewType, showScreenPopup, setHash, popupVisibility } from 'Knoin/Knoin';
import { view, command, ViewType, showScreenPopup, popupVisibility } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const
@ -235,14 +235,14 @@ class MessageListMailBoxUserView extends AbstractViewNext {
);
if ('INBOX' === sFolder) {
setHash(mailBox(sFolder, 1));
rl.route.setHash(mailBox(sFolder, 1));
}
if (message) {
this.selector.selectMessageItem(message);
} else {
if ('INBOX' !== sFolder) {
setHash(mailBox(sFolder, 1));
rl.route.setHash(mailBox(sFolder, 1));
}
MessageStore.selectMessageByFolderAndUid(sFolder, sUid);
@ -452,7 +452,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
}
cancelThreadUid() {
setHash(
rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
MessageStore.messageListPageBeforeThread(),
@ -690,7 +690,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
}
gotoPage(page) {
page && setHash(
page && rl.route.setHash(
mailBox(
FolderStore.currentFolderFullNameHash(),
page.value,
@ -704,7 +704,9 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (message && 0 < message.threadsLen()) {
MessageStore.messageListPageBeforeThread(MessageStore.messageListPage());
setHash(mailBox(FolderStore.currentFolderFullNameHash(), 1, MessageStore.messageListSearch(), message.uid));
rl.route.setHash(
mailBox(FolderStore.currentFolderFullNameHash(), 1, MessageStore.messageListSearch(), message.uid)
);
}
}

4
dev/View/User/Settings/Menu.js
View file

@ -3,7 +3,7 @@ import { leftPanelDisabled } from 'Common/Globals';
import { settings, inbox } from 'Common/Links';
import { getFolderInboxName } from 'Common/Cache';
import { view, ViewType, setHash, settingsMenuKeysHandler } from 'Knoin/Knoin';
import { view, ViewType, settingsMenuKeysHandler } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
@view({
@ -40,7 +40,7 @@ class MenuSettingsUserView extends AbstractViewNext {
}
backToMailBoxClick() {
setHash(inbox(getFolderInboxName()));
rl.route.setHash(inbox(getFolderInboxName()));
}
}

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

@ -4,7 +4,7 @@ import { leftPanelDisabled } from 'Common/Globals';
import MessageStore from 'Stores/User/Message';
import { view, ViewType, setHash } from 'Knoin/Knoin';
import { view, ViewType } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
@view({
@ -44,7 +44,7 @@ class PaneSettingsUserView extends AbstractViewNext {
}
backToMailBoxClick() {
setHash(inbox(getFolderInboxName()));
rl.route.setHash(inbox(getFolderInboxName()));
}
}

36
dev/bootstrap.js vendored
View file

@ -3,6 +3,8 @@ import * as Enums from 'Common/Enums';
import * as Plugins from 'Common/Plugins';
import { i18n } from 'Common/Translator';
import { root } from 'Common/Links';
export default (App) => {
addEventListener('keydown', event => {
@ -53,6 +55,40 @@ export default (App) => {
dropdownVisibility(!!rl.Dropdowns.find(item => item.classList.contains('open')))
).debounce(50);
rl.route = {
root: () => {
rl.route.setHash(root(), true);
rl.route.off();
},
reload: () => {
rl.root();
setTimeout(() => (rl.settings.app('inIframe') ? parent : window).location.reload(), 100);
},
off: () => hasher.changed.active = false,
on: () => hasher.changed.active = true,
/**
* @param {string} sHash
* @param {boolean=} silence = false
* @param {boolean=} replace = false
* @returns {void}
*/
setHash: (hash, silence = false, replace = false) => {
hash = hash.replace(/^[#/]+/, '');
const cmd = replace ? 'replaceHash' : 'setHash';
if (silence) {
hasher.changed.active = false;
hasher[cmd](hash);
hasher.changed.active = true;
} else {
hasher.changed.active = true;
hasher[cmd](hash);
hasher.setHash(hash);
}
}
};
rl.fetchJSON = (resource, init, postData) => {
init = Object.assign({
mode: 'same-origin',