Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235988
Change subject: Remove CSS readiness workaround
......................................................................
Remove CSS readiness workaround
RL's support for this should be bug-free now
Bug: T63852
Change-Id: Iaa6355648dcc1eb1780a7b1ee7e461d4213e3017
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 14 insertions(+), 34 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/88/235988/1
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index e7c6790..7b74774 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -85,7 +85,9 @@
*/
MMVB.loadViewer = function () {
var deferred = $.Deferred(),
- bs = this;
+ bs = this,
+ viewer,
+ message;
// Don't load if someone has specifically stopped us from doing
so
if ( mw.config.get( 'wgMediaViewer' ) !== true ) {
@@ -95,7 +97,17 @@
bs.setupOverlay();
mw.loader.using( 'mmv', function () {
- bs.isCSSReady( deferred );
+ try {
+ viewer = bs.getViewer();
+ } catch ( e ) {
+ message = e.message;
+ if ( e.stack ) {
+ message += '\n' + e.stack;
+ }
+ deferred.reject( message );
+ return;
+ }
+ deferred.resolve( viewer );
}, function ( error ) {
deferred.reject( error.message );
} );
@@ -114,38 +126,6 @@
bs.viewerIsBroken = true;
mw.notify( 'Error loading MediaViewer: ' + message );
} );
- };
-
- /**
- * Checks if the mmv CSS has been correctly added to the page
- * This is a workaround for core bug 61852
- * @param {jQuery.Promise.<mw.mmv.MultimediaViewer>} deferred
- */
- MMVB.isCSSReady = function ( deferred ) {
- var $dummy = $( '<div class="' + this.readinessCSSClass + '">' )
- .appendTo( $( document.body ) ),
- bs = this,
- viewer,
- message;
-
- if ( $dummy.css( 'display' ) === 'inline' ) {
- // Let's be clean and remove the test item before
resolving the deferred
- $dummy.remove();
- try {
- viewer = bs.getViewer();
- } catch ( e ) {
- message = e.message;
- if ( e.stack ) {
- message += '\n' + e.stack;
- }
- deferred.reject( message );
- return;
- }
- deferred.resolve( viewer );
- } else {
- $dummy.remove();
- setTimeout( function () { bs.isCSSReady( deferred ); },
this.readinessWaitDuration );
- }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/235988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa6355648dcc1eb1780a7b1ee7e461d4213e3017
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
