diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/css-panel/style-declaration.reel | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/css-panel/style-declaration.reel')
-rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.html | 6 | ||||
-rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.js | 12 |
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 | ||
11 | exports.StyleDeclaration = Montage.create(Component, { | 11 | exports.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 }, |