mirror of
https://github.com/aljazceru/CTFd.git
synced 2026-01-31 20:04:28 +01:00
Fix modal-body parameters in ezq.js and fix the progress bar for certain cases in ezProgressBar (#1278)
* Fix `modal-body` parameters in ezq.js for `ezAlert` and `ezQuery` and fix the progress bar for certain cases in `ezProgressBar` * Mostly copied from #1275
This commit is contained in:
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
@@ -58,7 +58,7 @@ const yesTpl =
|
||||
'<button type="button" class="btn btn-primary" data-dismiss="modal">Yes</button>';
|
||||
|
||||
export function ezAlert(args) {
|
||||
const modal = modalTpl.format(args.title, args.body);
|
||||
const modal = modalTpl.format(args.title);
|
||||
const obj = $(modal);
|
||||
|
||||
if (typeof args.body === "string") {
|
||||
@@ -141,7 +141,7 @@ export function ezToast(args) {
|
||||
}
|
||||
|
||||
export function ezQuery(args) {
|
||||
const modal = modalTpl.format(args.title, args.body);
|
||||
const modal = modalTpl.format(args.title);
|
||||
const obj = $(modal);
|
||||
|
||||
if (typeof args.body === "string") {
|
||||
@@ -180,9 +180,10 @@ export function ezProgressBar(args) {
|
||||
}
|
||||
|
||||
const progress = progressTpl.format(args.width);
|
||||
const modal = modalTpl.format(args.title, progress);
|
||||
const modal = modalTpl.format(args.title);
|
||||
|
||||
const obj = $(modal);
|
||||
obj.find(".modal-body").append($(progress));
|
||||
$("main").append(obj);
|
||||
|
||||
return obj.modal("show");
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
CTFd/themes/core/static/js/pages/main.min.js
vendored
2
CTFd/themes/core/static/js/pages/main.min.js
vendored
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
Reference in New Issue
Block a user