From 0ce4fa8a668eff96d71c0ddc4fe98e0b547e7096 Mon Sep 17 00:00:00 2001 From: Stephen Niedzielski Date: Thu, 10 Jan 2019 20:53:28 +0000 Subject: [PATCH] Hygiene: revise lazyImageLoader.loadImages() API There is no longer a need to pass in a jQuery dependency. Don't use the stateful skin to query image placeholders. Use the lazy image loader instead. Depends-On: I3d023b3d96bf278666abb956142e5cee12b68b1f Bug: T214658 Change-Id: I2bf42366c0e27462c32162124d07761b91d66166 --- resources/skins.minerva.scripts/downloadPageAction.js | 5 ++--- tests/qunit/skins.minerva.scripts/downloadPageAction.test.js | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/skins.minerva.scripts/downloadPageAction.js b/resources/skins.minerva.scripts/downloadPageAction.js index d65125d66..894bc55a3 100644 --- a/resources/skins.minerva.scripts/downloadPageAction.js +++ b/resources/skins.minerva.scripts/downloadPageAction.js @@ -96,9 +96,8 @@ // If all image downloads are taking longer to load then the MAX_PRINT_TIMEOUT // abort the spinner and print regardless. icon.timeout = setTimeout( doPrint, MAX_PRINT_TIMEOUT ); - lazyImageLoader.loadImages( - skin.$.bind( skin ), skin.getUnloadedImages() - ).then( doPrintBeforeTimeout, doPrintBeforeTimeout ); + lazyImageLoader.loadImages( lazyImageLoader.queryPlaceholders( document.getElementById( 'content' ) ) ) + .then( doPrintBeforeTimeout, doPrintBeforeTimeout ); } } diff --git a/tests/qunit/skins.minerva.scripts/downloadPageAction.test.js b/tests/qunit/skins.minerva.scripts/downloadPageAction.test.js index dfd2ba80b..34af3322a 100644 --- a/tests/qunit/skins.minerva.scripts/downloadPageAction.test.js +++ b/tests/qunit/skins.minerva.scripts/downloadPageAction.test.js @@ -34,6 +34,7 @@ spy = this.sandbox.stub( window, 'print' ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d.resolve() ); + this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] ); handler(); d.then( function () { @@ -49,6 +50,7 @@ spy = this.sandbox.stub( window, 'print' ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d ); + this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] ); window.setTimeout( function () { d.resolve(); @@ -69,6 +71,7 @@ spy = this.sandbox.stub( window, 'print' ); this.sandbox.stub( lazyImageLoader, 'loadImages' ).returns( d ); + this.sandbox.stub( lazyImageLoader, 'queryPlaceholders' ).returns( [] ); window.setTimeout( function () { d.resolve();