Matthias Mullie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352183 )
Change subject: [WIP] Fix MMV qunit tests
......................................................................
[WIP] Fix MMV qunit tests
It looks like this .then is never getting called, while .done is.
.done should still resolve immediately, while .then is now truly
async, but I don't understand while it doesn't seem to be called
at all (or not before timing out after <significant amount of time>)
And a lot of other tests/code still need fixing...
Bug: T164473
Change-Id: I3ca4f786890ad1646f71fe336afdb61e5c3b01c7
---
M resources/mmv/mmv.bootstrap.js
1 file changed, 16 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/83/352183/1
diff --git a/resources/mmv/mmv.bootstrap.js b/resources/mmv/mmv.bootstrap.js
index 4da5a9c..46d3371 100644
--- a/resources/mmv/mmv.bootstrap.js
+++ b/resources/mmv/mmv.bootstrap.js
@@ -112,20 +112,22 @@
deferred.reject( error.message );
} );
- return deferred.done( function ( viewer ) {
- if ( !bs.viewerInitialized ) {
- if ( bs.thumbs.length ) {
- viewer.initWithThumbs( bs.thumbs );
- }
+ return deferred.promise()
+ .done( function ( viewer ) {
+ if ( !bs.viewerInitialized ) {
+ if ( bs.thumbs.length ) {
+ viewer.initWithThumbs(
bs.thumbs );
+ }
- bs.viewerInitialized = true;
- }
- } ).fail( function ( message ) {
- mw.log.warn( message );
- bs.cleanupOverlay();
- bs.viewerIsBroken = true;
- mw.notify( 'Error loading MediaViewer: ' + message );
- } );
+ bs.viewerInitialized = true;
+ }
+ } )
+ .fail( function ( message ) {
+ mw.log.warn( message );
+ bs.cleanupOverlay();
+ bs.viewerIsBroken = true;
+ mw.notify( 'Error loading MediaViewer: ' +
message );
+ } );
};
/**
@@ -398,7 +400,7 @@
this.ensureEventHandlersAreSetUp();
- return this.loadViewer( true ).then( function ( viewer ) {
+ return this.loadViewer( true ).done( function ( viewer ) {
viewer.loadImageByTitle( title, true );
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/352183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ca4f786890ad1646f71fe336afdb61e5c3b01c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
