aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/style-declaration.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/css-panel/style-declaration.reel
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/css-panel/style-declaration.reel')
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html6
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js12
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
43 }, 43 },
44 "bindings": { 44 "bindings": {
45 "source": {"<-": "@repetition.objectAtCurrentIteration" }, 45 "source": {"<-": "@repetition.objectAtCurrentIteration" },
46 "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, 46 "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" },
47 "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, 47 "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" },
48 "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, 48 "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" },
49 "delegate": {"<-": "@owner.focusDelegate" } 49 "delegate": {"<-": "@owner.focusDelegate" }
50 } 50 }
51 } 51 }
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,
9 ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map"); 9 ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map");
10 10
11exports.StyleDeclaration = Montage.create(Component, { 11exports.StyleDeclaration = Montage.create(Component, {
12 arrayController: {
13 value: null
14 },
15
16 styleComponent: {
17 value: null
18 },
19
20 repetition: {
21 value: null
22 },
23
12 cssText : { value: null }, 24 cssText : { value: null },
13 focusDelegate : { value: null }, 25 focusDelegate : { value: null },
14 needsSort : { value: null }, 26 needsSort : { value: null },