Merge pull request #19994 from JerryShih/bug-1008026-wallpaper-flicke…

…ring-1.3

Bug 1008026 - show thumbnail instead of full size image, r=djf

apps/wallpaper/js/pick.js

@@ -1,5 +1,8 @@
+var wallpaperPath = '/resources/320x480/';
+var wallpaperThumbnailPath = wallpaperPath + 'thumbnails/';
+
 var Wallpaper = {
-  wallpapersUrl: '/resources/320x480/list.json',
+  wallpapersUrl: wallpaperPath + 'list.json',
 
   init: function wallpaper_init() {
     var self = this;
@@ -29,7 +32,8 @@ var Wallpaper = {
       xhr.response.forEach(function(wallpaper) {
         var div = document.createElement('div');
         div.classList.add('wallpaper');
-        div.style.backgroundImage = 'url(resources/320x480/' + wallpaper + ')';
+        div.style.backgroundImage = 'url(' + wallpaperThumbnailPath +
+                                     wallpaper + ')';
         self.wallpapers.appendChild(div);
       });
       if (cb) {
@@ -48,6 +52,9 @@ var Wallpaper = {
     // Identify the wallpaper
     var backgroundImage = e.target.style.backgroundImage;
     var src = backgroundImage.match(/url\([\"']?([^\s\"']*)[\"']?\)/)[1];
+    // Get the wallpaper file name
+    var array = src.split('/');
+    src = array.length > 1 ? wallpaperPath + array.pop() : '';
     // Ignore clicks that are not on one of the images
     if (src == '')
       return;

apps/wallpaper/test/unit/pick_test.js

@@ -21,9 +21,9 @@ suite('wallpaper/pick', function() {
       done(function() {
         var wallpapers = document.getElementById('wallpapers');
         assert.equal(2, wallpapers.children.length);
-        assert.equal('url("resources/320x480/test_1.png")',
+        assert.equal('url("/resources/320x480/thumbnails/test_1.png")',
           wallpapers.children[0].style.backgroundImage);
-        assert.equal('url("resources/320x480/test_2.png")',
+        assert.equal('url("/resources/320x480/thumbnails/test_2.png")',
           wallpapers.children[1].style.backgroundImage);
       });
     });