mirror of https://github.com/JohnHammond/CTFd.git
Fix ezq toast timeout and fix yarn build command for Python 3 (#1266)
* Fix `ezToast()` timeout * Force `yarn build` to use Python 3 * Closes #1265bulk-clear-sessions
parent
7ee47b0abe
commit
2f46f61ed0
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -125,14 +125,16 @@ export function ezToast(args) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let autohide = args.autohide || false;
|
let autohide = args.autohide !== false;
|
||||||
|
let animation = args.animation !== false;
|
||||||
let delay = args.delay || 10000; // 10 seconds
|
let delay = args.delay || 10000; // 10 seconds
|
||||||
|
|
||||||
$("#ezq--notifications-toast-container").prepend(obj);
|
$("#ezq--notifications-toast-container").prepend(obj);
|
||||||
|
|
||||||
obj.toast({
|
obj.toast({
|
||||||
autohide: autohide,
|
autohide: autohide,
|
||||||
delay: delay
|
delay: delay,
|
||||||
|
animation: animation
|
||||||
});
|
});
|
||||||
obj.toast("show");
|
obj.toast("show");
|
||||||
return obj;
|
return obj;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -140,7 +140,7 @@ function getJSConfig(root, type, entries, mode) {
|
||||||
// Pretty nasty hack, would be a little better if this was purely JS
|
// Pretty nasty hack, would be a little better if this was purely JS
|
||||||
new WebpackShellPlugin({
|
new WebpackShellPlugin({
|
||||||
onBuildEnd:[
|
onBuildEnd:[
|
||||||
mode == 'development' ? 'echo Skipping JS stub generation' : 'python -c \'exec(\"\"\"\nimport glob\nimport os\n\nstatic_js_dirs = [\n "CTFd/themes/core/static/js/**/*.dev.js",\n "CTFd/themes/admin/static/js/**/*.dev.js",\n]\n\nfor js_dir in static_js_dirs:\n for path in glob.glob(js_dir, recursive=True):\n if path.endswith(".dev.js"):\n path = path.replace(".dev.js", ".min.js")\n if os.path.isfile(path) is False:\n open(path, "a").close()\n\"\"\")\''
|
mode == 'development' ? 'echo Skipping JS stub generation' : 'python3 -c \'exec(\"\"\"\nimport glob\nimport os\n\nstatic_js_dirs = [\n "CTFd/themes/core/static/js/**/*.dev.js",\n "CTFd/themes/admin/static/js/**/*.dev.js",\n]\n\nfor js_dir in static_js_dirs:\n for path in glob.glob(js_dir, recursive=True):\n if path.endswith(".dev.js"):\n path = path.replace(".dev.js", ".min.js")\n if os.path.isfile(path) is False:\n open(path, "a").close()\n\"\"\")\''
|
||||||
],
|
],
|
||||||
safe: true,
|
safe: true,
|
||||||
}),
|
}),
|
||||||
|
|
Loading…
Reference in New Issue