Merge pull request #16329 from Joshua-S/bug-971704

[Bug 971704] - Clean up Wallpaper File Structure in Gaia

apps/wallpaper/build/build.js

@@ -8,7 +8,7 @@ var WallPaperAppBuilder = function(options) {
 
 WallPaperAppBuilder.prototype.APP_DIR = 'apps/wallpaper';
 WallPaperAppBuilder.prototype.BUILD_DIR = 'build_stage/wallpaper';
-WallPaperAppBuilder.prototype.WALLPAPER_PATH = 'resources/320x480';
+WallPaperAppBuilder.prototype.WALLPAPER_PATH = 'resources/';
 
 // set options
 WallPaperAppBuilder.prototype.setOptions = function(options) {

apps/wallpaper/js/pick.js

@@ -1,5 +1,5 @@
 var Wallpaper = {
-  wallpapersUrl: '/resources/320x480/list.json',
+  wallpapersUrl: '/resources/list.json',
 
   init: function wallpaper_init() {
     var self = this;
@@ -29,7 +29,7 @@ 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(resources/' + wallpaper + ')';
         self.wallpapers.appendChild(div);
       });
       if (cb) {

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/test_1.png")',
           wallpapers.children[0].style.backgroundImage);
-        assert.equal('url("resources/320x480/test_2.png")',
+        assert.equal('url("resources/test_2.png")',
           wallpapers.children[1].style.backgroundImage);
       });
     });

build/test/integration/distribution.test.js

@@ -105,11 +105,11 @@ suite('Distribution mechanism', function() {
   function validateWallpaper() {
     var zipPath = path.join(process.cwd(), 'profile',
       'webapps', 'wallpaper.gaiamobile.org', 'application.zip');
-    helper.checkFileContentByPathInZip(zipPath, 'resources/320x480/list.json',
+    helper.checkFileContentByPathInZip(zipPath, 'resources/list.json',
       path.join(cusDir, 'wallpapers', 'list.json'), true);
 
     helper.checkFileContentByPathInZip(zipPath,
-      'resources/320x480/customize.png',
+      'resources/customize.png',
       path.join(cusDir, 'wallpapers', 'customize.png'), false);
   }