Remove rl-anim feature and use no-mobile

This commit is contained in:
djmaze 2020-08-24 18:53:47 +02:00
parent 1e0586f124
commit d5665463fe
4 changed files with 8 additions and 25 deletions

2
dev/External/ko.js vendored
View file

@ -201,7 +201,7 @@ ko.bindingHandlers.modal = {
$(element).modal(ko.unwrap(fValueAccessor()) ? 'show' : 'hide'); $(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'); Globals.$htmlCL.add('rl-modal-animation');
setTimeout(() => Globals.$htmlCL.remove('rl-modal-animation'), 500); setTimeout(() => Globals.$htmlCL.remove('rl-modal-animation'), 500);
} }

View file

@ -1,5 +1,4 @@
import ko from 'ko'; import ko from 'ko';
import { $htmlCL, bMobileDevice } from 'Common/Globals';
import * as Settings from 'Storage/Settings'; import * as Settings from 'Storage/Settings';
class AbstractAppStore { class AbstractAppStore {
@ -8,16 +7,6 @@ class AbstractAppStore {
this.allowLanguagesOnLogin = ko.observable(true); this.allowLanguagesOnLogin = ko.observable(true);
this.newMoveToFolder = 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.prem = ko.observable(false);
this.community = ko.observable(true); this.community = ko.observable(true);
} }
@ -27,8 +16,6 @@ class AbstractAppStore {
this.allowLanguagesOnSettings(!!Settings.settingsGet('AllowLanguagesOnSettings')); this.allowLanguagesOnSettings(!!Settings.settingsGet('AllowLanguagesOnSettings'));
this.newMoveToFolder(!!Settings.settingsGet('NewMoveToFolder')); this.newMoveToFolder(!!Settings.settingsGet('NewMoveToFolder'));
this.interfaceAnimation(!!Settings.settingsGet('InterfaceAnimation'));
this.prem(!!Settings.settingsGet('PremType')); this.prem(!!Settings.settingsGet('PremType'));
this.community(!!Settings.settingsGet('Community')); this.community(!!Settings.settingsGet('Community'));
} }

View file

@ -71,7 +71,7 @@ html {
} }
} }
html.rl-anim { html.no-mobile {
.b-login-content { .b-login-content {
.alertError { .alertError {

16
dev/bootstrap.js vendored
View file

@ -59,21 +59,17 @@ export default (App) => {
window.rl = rl; window.rl = rl;
const start = () => {
setTimeout(() => {
$htmlCL.remove('no-js', 'rl-booted-trigger');
$htmlCL.add('rl-booted');
App.bootstart();
}, 10);
};
window.__APP_BOOT = fErrorCallback => { window.__APP_BOOT = fErrorCallback => {
jQuery(() => { jQuery(() => {
setTimeout(() => { setTimeout(() => {
if (window.rainloopTEMPLATES && rainloopTEMPLATES[0]) { if (window.rainloopTEMPLATES && rainloopTEMPLATES[0]) {
document.getElementById('rl-templates').innerHTML = 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 { } else {
fErrorCallback(); fErrorCallback();
} }