aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/css-style.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/css-style.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/css-style.reel')
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.js21
2 files changed, 22 insertions, 1 deletions
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html
index 00cebf39..0f16b3d8 100644
--- a/js/panels/css-panel/css-style.reel/css-style.html
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -30,7 +30,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
30 "checked": true 30 "checked": true
31 }, 31 },
32 "bindings": { 32 "bindings": {
33 "checked" : {"<<->": "@owner.enabled" } 33 "checked" : {"<->": "@owner.enabled" }
34 } 34 }
35 }, 35 },
36 "property": { 36 "property": {
diff --git a/js/panels/css-panel/css-style.reel/css-style.js b/js/panels/css-panel/css-style.reel/css-style.js
index 84841f5b..294d49a9 100644
--- a/js/panels/css-panel/css-style.reel/css-style.js
+++ b/js/panels/css-panel/css-style.reel/css-style.js
@@ -8,6 +8,27 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.CssStyle = Montage.create(Component, { 10exports.CssStyle = Montage.create(Component, {
11 declaration: {
12 value: null
13 },
14
15 addStyleButton: {
16 value: null,
17 serializable: true
18 },
19
20 propertyField: {
21 value: null
22 },
23
24 valueField: {
25 value: null
26 },
27
28 propertyNames: {
29 value: null
30 },
31
11 delegate : { value: null }, 32 delegate : { value: null },
12 disabledClass : { value: 'style-item-disabled' }, 33 disabledClass : { value: 'style-item-disabled' },
13 editingStyleClass : { value: 'edit-style-item' }, 34 editingStyleClass : { value: 'edit-style-item' },