Bug 965711 - [VsD Refresh] Homescreen/E.Me - Implement visual refresh to smart collections icons

apps/homescreen/everything.me/config/config.js

@@ -54,62 +54,6 @@ Evme.Config = Evme.__config = {
     }
   },
   'maxHistoryEntries': '10',
-  'iconsGroupSettings': {
-    '1': [{
-      'x': 'center',
-      'y': 'center',
-      'size': 0.65,
-      'shadowOffsetX': 0,
-      'shadowOffsetY': 2,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.8
-    }],
-    '2': [{
-      'x': 24,
-      'y': 'center',
-      'size': 0.5,
-      'shadowOffsetX': 0,
-      'shadowOffsetY': 2,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.7
-    },
-    {
-      'x': 6,
-      'y': 'center',
-      'size': 0.6,
-      'shadowOffsetX': 0,
-      'shadowOffsetY': 2,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.8
-    }],
-    '3': [{
-      'x': 'right',
-      'y': 'center',
-      'size': 0.45,
-      'shadowOffsetX': 1,
-      'shadowOffsetY': 1,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.4
-    },
-    {
-      'x': 'center+4',
-      'y': 'center',
-      'size': 0.5,
-      'shadowOffsetX': 1,
-      'shadowOffsetY': 1,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.7
-    },
-    {
-      'x': 'left',
-      'y': 'center',
-      'size': 0.6,
-      'shadowOffsetX': 1,
-      'shadowOffsetY': 1,
-      'shadowBlur': 2,
-      'shadowOpacity': 0.9
-    }]
-  },
   'design': {
     'apps': {
       'defaultIconUrl': {

apps/homescreen/everything.me/js/Brain.js

@@ -134,6 +134,47 @@
     }
   }
 
+  function updateCollectionBgImage(collectionSettings) {
+    var request;
+
+    var p = new window.Promise(function handler(resolve, reject) {
+      var query = collectionSettings.getQuery(),
+          checksum = collectionSettings.bg ?
+            collectionSettings.bg.checksum : null;
+
+      request = Evme.DoATAPI.bgimage({
+        '_checksum': checksum,
+        'query': query,
+        'feature': SEARCH_SOURCES.SHORTCUT_COLLECTION,
+        'exact': true,
+        'width': Evme.__config.bgImageSize[0],
+        'height': Evme.__config.bgImageSize[1]
+      }, function onSuccess(data) {
+        if (data.response) {
+          Evme.Collection.update(collectionSettings, {
+            'bg': {
+              'checksum': data.checksum,
+              'url': data.response.source,
+              'data': Evme.Utils.formatImageData(data.response.image),
+              'revision': data.response.image.revision
+            }
+          }, resolve);
+        } else {
+          reject();
+        }
+      });
+    });
+
+    // for backwards compatibility we return an 'abortable' object
+    p.abort = function abortWrapper() {
+      if (request.abort) {
+        request.abort();
+      }
+    };
+
+    return p;
+  }
+
   /*  EVENT HANDLERS */
 
   // Core.js
@@ -994,25 +1035,12 @@
     }
 
     function loadBGImage() {
-      if (!Evme.Collection.isOpen()) { return; }
-      if (Evme.Collection.userSetBg()) { return; }
-
-      var query = Evme.Collection.getQuery();
-
-      requestCollectionImage = Evme.DoATAPI.bgimage({
-        'query': query,
-        'feature': SEARCH_SOURCES.SHORTCUT_COLLECTION,
-        'exact': true,
-        'width': Evme.__config.bgImageSize[0],
-        'height': Evme.__config.bgImageSize[1]
-      }, function onSuccess(data) {
-        Evme.Collection.setBackground({
-          'image': Evme.Utils.formatImageData(data.response.image),
-          'query': query,
-          'source': data.response.source,
-          'setByUser': false
-        });
+      var collectionSettings = Evme.Collection.getCurrentSettings();
 
+      requestCollectionImage = updateCollectionBgImage(collectionSettings);
+      requestCollectionImage.then(function resolved() {
+        requestCollectionImage = null;
+      }, function rejected() {
         requestCollectionImage = null;
       });
     }
@@ -1305,6 +1333,8 @@
                 Evme.Collection.update(collectionSettings, {
                   'extraIconsData': extraIconsData
                 });
+
+                updateCollectionBgImage(collectionSettings);
               }
             });
         }

apps/homescreen/everything.me/js/Core.js

@@ -292,8 +292,6 @@ window.Evme = new function Evme_Core() {
 
     Evme.InstalledAppsService.init();
 
-    Evme.IconGroup.init({});
-
     Evme.IconManager.init({});
 
     Evme.SearchHistory.init({

apps/homescreen/everything.me/js/api/DoATAPI.js

@@ -240,6 +240,7 @@ Evme.DoATAPI = new function Evme_DoATAPI() {
     !options && (options = {});
 
     var params = {
+      '_checksum': options._checksum || '',
       'query': options.query,
       'experienceId': options.experienceId || '',
       'typeHint': options.typeHint || '',

apps/homescreen/everything.me/js/everything.me.js

@@ -254,7 +254,8 @@ var EverythingME = {
           'modules/Results/ResultManager.js',
           'modules/Searchbar/Searchbar.js',
           'modules/SearchHistory/SearchHistory.js',
-          'modules/Collection/Collection.js'
+          'modules/Collection/Collection.js',
+          'modules/Collection/CollectionIcon.js'
         ],
         css_files = [
           'shared/style/confirm.css',