diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/panels/css-panel/css-style.reel | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/css-panel/css-style.reel')
-rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.html | 2 | ||||
-rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.js | 21 |
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 | ||
10 | exports.CssStyle = Montage.create(Component, { | 10 | exports.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' }, |