Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

2 files changed, 15 insertions, 3 deletions

diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html
index fad54453..4cdf0741 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.html
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html
@@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 },
                 "bindings": {
                     "source": {"<-": "@repetition.objectAtCurrentIteration" },
-                    "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" },
-                    "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" },
-                    "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" },
+                    "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" },
+                    "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" },
+                    "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" },
                     "delegate": {"<-": "@owner.focusDelegate" }
                 }
             }
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.js b/js/panels/css-panel/style-declaration.reel/style-declaration.js
index 6187989b..b9205ba7 100644
--- a/js/panels/css-panel/style-declaration.reel/style-declaration.js
+++ b/js/panels/css-panel/style-declaration.reel/style-declaration.js
@@ -9,6 +9,18 @@ var Montage = require("montage/core/core").Montage,
     ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map");
 
 exports.StyleDeclaration = Montage.create(Component, {
+    arrayController: {
+        value: null
+    },
+
+    styleComponent: {
+        value: null
+    },
+
+    repetition: {
+        value: null
+    },
+
     cssText : { value: null },
     focusDelegate : { value: null },
     needsSort : { value: null },