golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Hygiene: revise lazyImageLoader.loadImages() API"

This commit is contained in:
jenkins-bot 2019-01-25 20:52:49 +00:00 committed by Gerrit Code Review
parent 6bdbddc59d 0ce4fa8a66
commit 74a37b0412
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/skins.minerva.scripts/downloadPageAction.js
View File

@ -96,9 +96,8 @@
// If all image downloads are taking longer to load then the MAX_PRINT_TIMEOUT // If all image downloads are taking longer to load then the MAX_PRINT_TIMEOUT
// abort the spinner and print regardless. // abort the spinner and print regardless.
icon.timeout = setTimeout( doPrint, MAX_PRINT_TIMEOUT ); icon.timeout = setTimeout( doPrint, MAX_PRINT_TIMEOUT );
lazyImageLoader.loadImages( lazyImageLoader.loadImages( lazyImageLoader.queryPlaceholders( document.getElementById( 'content' ) ) )
skin.$.bind( skin ), skin.getUnloadedImages() .then( doPrintBeforeTimeout, doPrintBeforeTimeout );
).then( doPrintBeforeTimeout, doPrintBeforeTimeout );
} }
} }

3
tests/qunit/skins.minerva.scripts/downloadPageAction.test.js
View File

@ -34,6 +34,7 @@
spy = this.sandbox.stub( window, 'print' ); spy = this.sandbox.stub( window, 'print' );
this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d.resolve() ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d.resolve() );
this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] );
handler(); handler();
d.then( function () { d.then( function () {
@ -49,6 +50,7 @@
spy = this.sandbox.stub( window, 'print' ); spy = this.sandbox.stub( window, 'print' );
this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d );
this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] );
window.setTimeout( function () { window.setTimeout( function () {
d.resolve(); d.resolve();
@ -69,6 +71,7 @@
spy = this.sandbox.stub( window, 'print' ); spy = this.sandbox.stub( window, 'print' );
this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d );
this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] );
window.setTimeout( function () { window.setTimeout( function () {
d.resolve(); d.resolve();