Skip to content

Commit 3940430

Browse files
committed
1 parent 70f688b commit 3940430

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

ts/WoltLabSuite/Core/Helper/PageOverlay.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,5 @@ export function releasePageOverlayContainer(element: HTMLElement): void {
6161
export function getPageOverlayContainer(): HTMLElement {
6262
return container;
6363
}
64+
65+
window.__wcf_bc_getPageOverlayContainer = getPageOverlayContainer;

ts/global.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ declare global {
5151
__wcf_bc_colorUtil: typeof ColorUtil;
5252
__wcf_bc_datePicker: typeof DatePicker;
5353
__wcf_bc_eventHandler: typeof EventHandler;
54+
__wcf_bc_getPageOverlayContainer: () => HTMLElement;
5455

5556
WoltLabLanguage: {
5657
getPhrase(key: string, parameters?: object): string;

wcfsetup/install/files/js/WCF.ImageViewer.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@ WCF.ImageViewer = Class.extend({
1818
* Initializes the WCF.ImageViewer class.
1919
*/
2020
init: function() {
21-
this._triggerElement = $('<span class="wcfImageViewerTriggerElement" />').data('disableSlideshow', true).hide().appendTo(document.body);
22-
this._triggerElement.wcfImageViewer({
23-
enableSlideshow: 0,
24-
imageSelector: '.jsImageViewerEnabled',
25-
staticViewer: true
21+
require(["WoltLabSuite/Core/Helper/PageOverlay"], ({ getPageOverlayContainer }) => {
22+
this._triggerElement = $('<span class="wcfImageViewerTriggerElement" />')
23+
.data("disableSlideshow", true)
24+
.hide()
25+
.appendTo(getPageOverlayContainer());
26+
this._triggerElement.wcfImageViewer({
27+
enableSlideshow: 0,
28+
imageSelector: ".jsImageViewerEnabled",
29+
staticViewer: true,
30+
});
31+
32+
WCF.DOMNodeInsertedHandler.addCallback("WCF.ImageViewer", $.proxy(this._domNodeInserted, this));
33+
WCF.DOMNodeInsertedHandler.execute();
2634
});
27-
28-
WCF.DOMNodeInsertedHandler.addCallback('WCF.ImageViewer', $.proxy(this._domNodeInserted, this));
29-
WCF.DOMNodeInsertedHandler.execute();
3035
},
3136

3237
/**
@@ -895,7 +900,11 @@ $.widget('ui.wcfImageViewer', {
895900

896901
this._didInit = true;
897902

898-
this._container = $('<div class="wcfImageViewer' + (this.options.staticViewer ? ' wcfImageViewerStatic' : '') + '" />').appendTo(document.body);
903+
this._container = $(
904+
'<div class="wcfImageViewer' +
905+
(this.options.staticViewer ? " wcfImageViewerStatic" : "") +
906+
'" />',
907+
).appendTo(window.__wcf_bc_getPageOverlayContainer());
899908
var $imageContainer = $('<div><img /><img /></div>').appendTo(this._container);
900909
var $imageList = $('<footer><span class="wcfImageViewerButtonPrevious"><fa-icon size="24" name="angles-left"></fa-icon></span><div><ul /></div><span class="wcfImageViewerButtonNext"><fa-icon size="24" name="angles-right"></fa-icon></span></footer>').appendTo(this._container);
901910
var $slideshowContainer = $('<ul />').appendTo($imageContainer);

wcfsetup/install/files/js/WoltLabSuite/Core/Helper/PageOverlay.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)