Merge pull request #24115 from ddrmanxbxfr/bug_1062807

Bug 1062807 - Use the new shared helper for loading JSON files in the wallpaper app r=@yurenju

apps/wallpaper/js/pick.js

@@ -23,33 +23,31 @@ var Wallpaper = {
   },
 
   generateWallpaperList: function wallpaper_generateWallpaperList(cb) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', this.wallpapersUrl, true);
-    xhr.responseType = 'json';
-    xhr.send(null);
-
     var self = this;
     // Get #-moz-samplesize media fragment to downsample while decoding
     // so that we can display smaller images without using lot of memory
     // See Bug 1011460
     var sampleSize = Downsample.sizeNoMoreThan(this.thumbnailScale);
-    xhr.onload = function successGenerateWallpaperList() {
-      self.wallpapers.innerHTML = '';
-      xhr.response.forEach(function(wallpaper) {
-        var fileName = 'resources/' + wallpaper;
-        // Use image tag instead of backgroundImage because gecko handles
-        // memory for off-screen images better
-        var imgNode = document.createElement('img');
-        imgNode.alt = '';
-        imgNode.classList.add('wallpaper');
-        imgNode.dataset.filename = fileName;
-        imgNode.src = fileName + sampleSize;
-        self.wallpapers.appendChild(imgNode);
-      });
-      if (cb) {
-        cb();
-      }
-    };
+
+    LazyLoader.getJSON(this.wallpapersUrl)
+      .then(function(json) {
+        self.wallpapers.innerHTML = '';
+        json.forEach(function(wallpaper) {
+          var fileName = 'resources/' + wallpaper;
+          // Use image tag instead of backgroundImage
+          // because gecko handles
+          // memory for off-screen images better
+          var imgNode = document.createElement('img');
+          imgNode.alt = '';
+          imgNode.classList.add('wallpaper');
+          imgNode.dataset.filename = fileName;
+          imgNode.src = fileName + sampleSize;
+          self.wallpapers.appendChild(imgNode);
+        });
+        if (cb) {
+          cb();
+        }
+    });
   },
 
   startPick: function wallpaper_startPick(request) {

apps/wallpaper/pick.html

@@ -11,6 +11,7 @@
     <!-- Shared code -->
     <script type="text/javascript" src="shared/js/l10n.js"></script>
     <script type="text/javascript" defer src="shared/js/media/downsample.js"></script>
+    <script type="text/javascript" src="/shared/js/lazy_loader.js"></script>
     <!-- Web Components -->
     <script defer src="shared/elements/config.js"></script>
     <script defer src="shared/elements/gaia-header/dist/script.js"></script>

apps/wallpaper/test/unit/pick_test.js

@@ -1,3 +1,4 @@
+require('/shared/js/lazy_loader.js');
 require('/shared/js/media/downsample.js');
 requireApp('wallpaper/js/pick.js');