Merge pull request #9525 from level420/level420-fix-9524

Fix for #9524: fix recursive included decorator style propagation
qooxdoo · Apr 26, 2018 · 2bb08cb · 2bb08cb
2 parents 272e737 + d31bc04
commit 2bb08cb
Showing 1 changed file with 25 additions and 59 deletions.
diff --git a/framework/source/class/qx/theme/manager/Decoration.js b/framework/source/class/qx/theme/manager/Decoration.js
@@ -127,9 +127,8 @@ qx.Class.define("qx.theme.manager.Decoration",
       var styles = instance.getStyles(true);
 
       // Sort the styles so that more specific styles come after the group styles, 
-      //  eg background-color comes after background.  The reordering is only applied
-      //  to rules which begin with the names in REORDER; the sort order is alphabetical
-      //  so that short cut rules come before actual
+      // eg background-color comes after background. The sort order is alphabetical
+      // so that short cut rules come before actual
       Object.keys(styles).sort().forEach(function(key) {
         // if we find a map value, use it as pseudo class
         if (qx.Bootstrap.isObject(styles[key])) {
@@ -189,11 +188,6 @@ qx.Class.define("qx.theme.manager.Decoration",
         return value;
       }
 
-      var theme = this.getTheme();
-      if (!theme) {
-        return null;
-      }
-
       var cache = this.__dynamic;
       if (!cache) {
         cache = this.__dynamic = {};
@@ -204,66 +198,38 @@ qx.Class.define("qx.theme.manager.Decoration",
         return resolved;
       }
 
-      var entry = qx.lang.Object.clone(theme.decorations[value], true);
-      if (!entry) {
+      var theme = this.getTheme();
+      if (!theme) {
         return null;
       }
 
-      // create empty style map if necessary
-      if (!entry.style) {
-        entry.style = {};
+      if(!theme.decorations[value]) {
+        return null;
       }
-
-      // check for inheritance
-      if (entry.include) {
-        var included = {
-          style: {}
-        };
-
-        var handleIncludedEntry = function(entry) {
-          if (entry.include) {
-            handleIncludedEntry(entry.include);
-          } else {
-            var decorationEntry = theme.decorations[entry];
-            // decoration key
-            if (decorationEntry.decorator) {
-              included.decorator = qx.lang.Object.clone(decorationEntry.decorator);
-            }
-
-            // styles key
-            if (decorationEntry.style) {
-              for (var key in decorationEntry.style) {
-                included.style[key] = qx.lang.Object.clone(decorationEntry.style[key], true);
-              }
-            }
-          }
-        };
-
-        handleIncludedEntry(entry);
-
-        var result = {
-          style: {}
-        };
-
-        if (entry.decorator || included.decorator) {
-          result.decorator = qx.lang.Object.clone(entry.decorator || included.decorator);
+
+      // create an empty decorator
+      var decorator = new qx.ui.decoration.Decorator();
+
+      // handle recursive decorator includes
+      var recurseDecoratorInclude = function(currentEntry, name) {
+        // follow the include chain to the topmost decorator entry
+        if(currentEntry.include && theme.decorations[currentEntry.include]) {
+          recurseDecoratorInclude(theme.decorations[currentEntry.include], currentEntry.include);
         }
 
-        // styles key
-        if (included.style) {
-          result.style = qx.lang.Object.clone(included.style, true);
-
-          for (var key in entry.style) {
-            result.style[key] = qx.lang.Object.clone(entry.style[key], true);
-          }
-        } else {
-          result.style = qx.lang.Object.clone(entry.style, true);
+        // apply styles from the included decorator, 
+        // overwriting existing values.
+        if (currentEntry.style) {
+          decorator.set(currentEntry.style);
         }
+      };
 
-        entry = qx.lang.Object.clone(result, true);
-      }
+      // start with the current decorator entry
+      recurseDecoratorInclude(theme.decorations[value], value);
 
-      return cache[value] = (new qx.ui.decoration.Decorator()).set(entry.style);
+      cache[value] = decorator;
+
+      return cache[value];
     },