UX: replace lightbox loading text with spinner (#7393)

This commit is contained in:
Joe 2019-04-17 10:24:03 -07:00 committed by GitHub
parent 7cd621778d
commit ee808dc682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View File

@ -2,6 +2,7 @@ import loadScript from "discourse/lib/load-script";
import { escapeExpression } from "discourse/lib/utilities";
import { renderIcon } from "discourse-common/lib/icon-library";
import { isAppWebview, postRNWebviewMessage } from "discourse/lib/utilities";
import { spinnerHTML } from "discourse/helpers/loading-spinner";
export default function($elem) {
if (!$elem) {
@ -10,6 +11,7 @@ export default function($elem) {
loadScript("/javascripts/jquery.magnific-popup.min.js").then(function() {
const spoilers = $elem.find(".spoiler a.lightbox, .spoiled a.lightbox");
$elem
.find("a.lightbox")
.not(spoilers)
@ -18,6 +20,8 @@ export default function($elem) {
closeOnContentClick: false,
removalDelay: 300,
mainClass: "mfp-zoom-in",
tClose: I18n.t("lightbox.close"),
tLoading: spinnerHTML,
gallery: {
enabled: true,
@ -26,8 +30,6 @@ export default function($elem) {
tCounter: I18n.t("lightbox.counter")
},
tClose: I18n.t("lightbox.close"),
tLoading: I18n.t("lightbox.loading"),
ajax: {
tError: I18n.t("lightbox.content_load_error")
},

View File

@ -100,3 +100,7 @@ $meta-element-margin: 6px;
}
}
}
.mfp-preloader .spinner {
margin: auto;
}

View File

@ -2806,7 +2806,6 @@ en:
next: "Next (Right arrow key)"
counter: "%curr% of %total%"
close: "Close (Esc)"
loading: "Loading…"
content_load_error: '<a href="%url%">The content</a> could not be loaded.'
image_load_error: '<a href="%url%">The image</a> could not be loaded.'