diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/css-panel/css-style.reel/css-style.js | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/css-panel/css-style.reel/css-style.js')
-rw-r--r-- | js/panels/css-panel/css-style.reel/css-style.js | 21 |
1 files changed, 21 insertions, 0 deletions
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' }, |