Added an option to abort the loader animation
This commit is contained in:
parent
130e64162a
commit
df73618bd0
5 changed files with 16 additions and 4 deletions
|
@ -132,8 +132,8 @@ export function abort() {
|
||||||
loopInterval = 0;
|
loopInterval = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function finalize() {
|
export function finalize(abortAnimation: boolean) {
|
||||||
if(getUrlParameter("loader-abort") === "1") {
|
if(abortAnimation) {
|
||||||
abort();
|
abort();
|
||||||
} else {
|
} else {
|
||||||
finalizing = true;
|
finalizing = true;
|
||||||
|
|
|
@ -2,6 +2,7 @@ import * as script_loader from "./script_loader";
|
||||||
import * as style_loader from "./style_loader";
|
import * as style_loader from "./style_loader";
|
||||||
import * as template_loader from "./template_loader";
|
import * as template_loader from "./template_loader";
|
||||||
import * as Animation from "../animation";
|
import * as Animation from "../animation";
|
||||||
|
import {getUrlParameter} from "./utils";
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface Window {
|
interface Window {
|
||||||
|
@ -27,13 +28,15 @@ export interface Config {
|
||||||
error: boolean;
|
error: boolean;
|
||||||
|
|
||||||
baseUrl: string;
|
baseUrl: string;
|
||||||
|
abortAnimationOnFinish: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export let config: Config = {
|
export let config: Config = {
|
||||||
loader_groups: false,
|
loader_groups: false,
|
||||||
verbose: false,
|
verbose: false,
|
||||||
error: true,
|
error: true,
|
||||||
baseUrl: "./"
|
baseUrl: "./",
|
||||||
|
abortAnimationOnFinish: getUrlParameter("loader-abort") === "1"
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Task = {
|
export type Task = {
|
||||||
|
@ -298,7 +301,7 @@ export async function execute(customLoadingAnimations: boolean) {
|
||||||
if(config.verbose)
|
if(config.verbose)
|
||||||
console.debug("[loader] finished loader. (Total time: %dms)", Date.now() - load_begin);
|
console.debug("[loader] finished loader. (Total time: %dms)", Date.now() - load_begin);
|
||||||
|
|
||||||
Animation.finalize();
|
Animation.finalize(config.abortAnimationOnFinish);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function execute_managed(customLoadingAnimations: boolean) {
|
export function execute_managed(customLoadingAnimations: boolean) {
|
||||||
|
|
1
loader/exports/loader.d.ts
vendored
1
loader/exports/loader.d.ts
vendored
|
@ -1,4 +1,5 @@
|
||||||
export interface Config {
|
export interface Config {
|
||||||
|
abortAnimationOnFinish: boolean;
|
||||||
loader_groups: boolean;
|
loader_groups: boolean;
|
||||||
verbose: boolean;
|
verbose: boolean;
|
||||||
error: boolean;
|
error: boolean;
|
||||||
|
|
|
@ -326,6 +326,7 @@ const task_teaweb_starter: loader.Task = {
|
||||||
} else
|
} else
|
||||||
$(document).one('click', () => aplayer.initializeFromGesture());
|
$(document).one('click', () => aplayer.initializeFromGesture());
|
||||||
}
|
}
|
||||||
|
loader.config.abortAnimationOnFinish = settings.static_global(Settings.KEY_LOADER_ANIMATION_ABORT);
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
console.error(ex.stack);
|
console.error(ex.stack);
|
||||||
if(ex instanceof ReferenceError || ex instanceof TypeError)
|
if(ex instanceof ReferenceError || ex instanceof TypeError)
|
||||||
|
|
|
@ -498,6 +498,13 @@ export class Settings extends StaticSettings {
|
||||||
valueType: "boolean",
|
valueType: "boolean",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static readonly KEY_LOADER_ANIMATION_ABORT: ValuedSettingsKey<boolean> = {
|
||||||
|
key: 'loader_animation_abort',
|
||||||
|
defaultValue: false,
|
||||||
|
description: 'Abort the loader animation when the app has been finished loading',
|
||||||
|
valueType: "boolean",
|
||||||
|
};
|
||||||
|
|
||||||
static readonly FN_LOG_ENABLED: (category: string) => SettingsKey<boolean> = category => {
|
static readonly FN_LOG_ENABLED: (category: string) => SettingsKey<boolean> = category => {
|
||||||
return {
|
return {
|
||||||
key: "log." + category.toLowerCase() + ".enabled",
|
key: "log." + category.toLowerCase() + ".enabled",
|
||||||
|
|
Loading…
Add table
Reference in a new issue