diff --git a/dev/External/ko.js b/dev/External/ko.js index af067af72..bed90edc1 100644 --- a/dev/External/ko.js +++ b/dev/External/ko.js @@ -201,7 +201,7 @@ ko.bindingHandlers.modal = { $(element).modal(ko.unwrap(fValueAccessor()) ? 'show' : 'hide'); - if (Globals.$htmlCL.contains('rl-anim')) { + if (Globals.$htmlCL.contains('no-mobile')) { Globals.$htmlCL.add('rl-modal-animation'); setTimeout(() => Globals.$htmlCL.remove('rl-modal-animation'), 500); } diff --git a/dev/Stores/AbstractApp.js b/dev/Stores/AbstractApp.js index 7713bbb69..2fa72ce50 100644 --- a/dev/Stores/AbstractApp.js +++ b/dev/Stores/AbstractApp.js @@ -1,5 +1,4 @@ import ko from 'ko'; -import { $htmlCL, bMobileDevice } from 'Common/Globals'; import * as Settings from 'Storage/Settings'; class AbstractAppStore { @@ -8,16 +7,6 @@ class AbstractAppStore { this.allowLanguagesOnLogin = ko.observable(true); this.newMoveToFolder = ko.observable(true); - this.interfaceAnimation = ko.observable(true); - - this.interfaceAnimation.subscribe((value) => { - const anim = bMobileDevice || !value; - $htmlCL.toggle('rl-anim', !anim); - $htmlCL.toggle('no-rl-anim', anim); - }); - - this.interfaceAnimation.valueHasMutated(); - this.prem = ko.observable(false); this.community = ko.observable(true); } @@ -27,8 +16,6 @@ class AbstractAppStore { this.allowLanguagesOnSettings(!!Settings.settingsGet('AllowLanguagesOnSettings')); this.newMoveToFolder(!!Settings.settingsGet('NewMoveToFolder')); - this.interfaceAnimation(!!Settings.settingsGet('InterfaceAnimation')); - this.prem(!!Settings.settingsGet('PremType')); this.community(!!Settings.settingsGet('Community')); } diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 09981848e..3ad247b8b 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -71,7 +71,7 @@ html { } } -html.rl-anim { +html.no-mobile { .b-login-content { .alertError { diff --git a/dev/bootstrap.js b/dev/bootstrap.js index 3f2cbf392..7120229ce 100644 --- a/dev/bootstrap.js +++ b/dev/bootstrap.js @@ -59,21 +59,17 @@ export default (App) => { window.rl = rl; - const start = () => { - setTimeout(() => { - $htmlCL.remove('no-js', 'rl-booted-trigger'); - $htmlCL.add('rl-booted'); - - App.bootstart(); - }, 10); - }; - window.__APP_BOOT = fErrorCallback => { jQuery(() => { setTimeout(() => { if (window.rainloopTEMPLATES && rainloopTEMPLATES[0]) { document.getElementById('rl-templates').innerHTML = rainloopTEMPLATES[0]; - start(); + setTimeout(() => { + $htmlCL.remove('no-js', 'rl-booted-trigger'); + $htmlCL.add('rl-booted'); + + App.bootstart(); + }, 10); } else { fErrorCallback(); }