Improved boot.js with existing global window.rl

Put dev/Storage/Settings.js in boots.js global rl.settings
This commit is contained in:
djmaze 2020-09-04 12:05:17 +02:00
parent f90dbcc84b
commit aeb5275648
57 changed files with 284 additions and 380 deletions

View file

@ -39,8 +39,6 @@ import MessageStore from 'Stores/User/Message';
import Remote from 'Remote/User/Ajax';
import * as Settings from 'Storage/Settings';
import { ComposeAttachmentModel } from 'Model/ComposeAttachment';
import { getApp } from 'Helper/Apps/User';
@ -48,6 +46,8 @@ import { getApp } from 'Helper/Apps/User';
import { popup, command, isPopupVisible, showScreenPopup, hideScreenPopup, routeOn, routeOff } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
const Settings = rl.settings;
@popup({
name: 'View/Popup/Compose',
templateID: 'PopupsCompose'
@ -1138,7 +1138,7 @@ class ComposePopupView extends AbstractViewNext {
});
}
if (Settings.appSettingsGet('allowCtrlEnterOnCompose')) {
if (Settings.app('allowCtrlEnterOnCompose')) {
key('ctrl+enter, command+enter', KeyState.Compose, () => {
this.sendCommand();
return false;
@ -1184,7 +1184,7 @@ class ComposePopupView extends AbstractViewNext {
initUploader() {
if (this.composeUploaderButton()) {
const uploadCache = {},
attachmentSizeLimit = pInt(Settings.settingsGet('AttachmentLimit')),
attachmentSizeLimit = pInt(Settings.get('AttachmentLimit')),
oJua = new Jua({
action: upload(),
name: 'uploader',