fix: don't cache icon background (#471)

fixes #425
resoai · Oct 12, 2020 · f9ea1ef · f9ea1ef
1 parent f6a0911
commit f9ea1ef
Showing 1 changed file with 8 additions and 27 deletions.
diff --git a/scripts/controllers/main.js b/scripts/controllers/main.js
@@ -440,34 +440,15 @@ App.controller('Main', function ($scope, $timeout, $location, Api) {
    };
 
    $scope.itemBgStyles = function (item, entity) {
-      const obj = entity.attributes || entity;
+      const bg = getItemFieldValue('bg', item, entity);
+      const bgSuffix = getItemFieldValue('bgSuffix', item, entity);
+      const opacity = getItemFieldValue('bgOpacity', item, entity);
 
-      if (!obj.bgStyles) {
-         let bg;
-         const styles = {};
-
-         if ('bgOpacity' in item) {
-            styles.opacity = parseFieldValue(item.bgOpacity, item, entity);
-         }
-
-         if (item.bg) {
-            bg = parseFieldValue(item.bg, item, entity);
-
-            if (bg) {
-               styles.backgroundImage = 'url(' + bg + ')';
-            }
-         } else if (item.bgSuffix) {
-            bg = parseFieldValue(item.bgSuffix, item, entity);
-
-            if (bg) {
-               styles.backgroundImage = 'url("' + toAbsoluteServerURL(bg) + '")';
-            }
-         }
-
-         obj.bgStyles = styles;
-      }
-
-      return obj.bgStyles;
+      return {
+         opacity: opacity || null,
+         backgroundImage: bg ? `url("${bg}")`
+            : bgSuffix ? `url("${toAbsoluteServerURL(bgSuffix)}")` : null,
+      };
    };
 
    $scope.itemClasses = function (item) {