Node.js based forum software built for the modern web
refactor: get rid of unnecessary new Promise
Barış Soner Uşaklı808ad4fc4b35
diff --git a/public/src/app.js b/public/src/app.jsindex 6a721e3258..16370a8b55 100644--- a/public/src/app.js+++ b/public/src/app.js@@ -327,18 +327,13 @@ if (document.readyState === 'loading') {blockName = undefined;}- return new Promise((resolve, reject) => {- require(['benchpress'], function (Benchpress) {- Benchpress.render(template, data, blockName)- .then(resolve, reject);- });- }).then((html) => {+ return Benchpress.render(template, data, blockName).then((html) => {try {html = $(html);} catch (err) {// handle cases where the template parsed has multiple elements at the root level// this breaks the jquery selector so we wrap it in a div- if (err.startsWith('Syntax error, unrecognized expression')) {+ if (err.message.startsWith('Syntax error, unrecognized expression')) {html = $(`<div>${html}</div>`);} else {throw err;diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tplindex eea98626ce..3e38d66dd6 100644--- a/src/views/admin/appearance/skins.tpl+++ b/src/views/admin/appearance/skins.tpl@@ -16,8 +16,10 @@<div class="tab-content"><div class="tab-pane fade show active" role="tabpanel" id="skins-tab"><div class="skins px-2">- <div class="directory row text-center" id="bootstrap_themes">- <i class="fa fa-refresh fa-spin"></i> {{tx("admin/appearance/skins:loading")}}+ <div class="directory row" id="bootstrap_themes">+ <div class="col-12 text-center p-3">+ <i class="fa fa-refresh fa-spin"></i> {{tx("admin/appearance/skins:loading")}}+ </div></div></div></div>diff --git a/src/views/admin/partials/theme_list.tpl b/src/views/admin/partials/theme_list.tplindex edb7352f7a..d039a00039 100644--- a/src/views/admin/partials/theme_list.tpl+++ b/src/views/admin/partials/theme_list.tpl@@ -2,19 +2,19 @@<div class="col-lg-4 col-md-6 col-12 mb-4" data-type="{./type}" data-theme-name="{./name}" data-theme="{./id}"{{{ if ./css }}} data-css="{./css}" {{{ end }}}><div class="card h-100"><img src="{./screenshot_url}" class="card-img-top">- <div class="card-body">+ <div class="card-body text-center"><h5 class="card-title">{./name}</h5><p class="card-text">{./description}</p>{{{ if ./url }}}- <p>+ <p class="mb-0"><a href="{./url}" target="_blank">{{tx("admin/appearance/themes:homepage")}}</a></p>{{{ end }}}</div>- <div class="card-footer">+ <div class="card-footer text-center"><a class="btn btn-primary" data-action="use">{{{ if ./skin }}}{{tx("admin/appearance/skins:select-skin")}}{{{ else }}}{{tx("admin/appearance/themes:select-theme")}}{{{ end }}}</a>