diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /js/panels/css-panel/styles-view-container.reel | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/css-panel/styles-view-container.reel')
-rw-r--r-- | js/panels/css-panel/styles-view-container.reel/styles-view-container.html | 1 | ||||
-rw-r--r-- | js/panels/css-panel/styles-view-container.reel/styles-view-container.js | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html index 93ac3793..150f20fa 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html | |||
@@ -16,7 +16,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
16 | "element" : {"#" : "container"}, | 16 | "element" : {"#" : "container"}, |
17 | "ruleListContainer": {"@": "ruleListContainer" }, | 17 | "ruleListContainer": {"@": "ruleListContainer" }, |
18 | "computedStyleView": {"@": "computedStyleView" }, | 18 | "computedStyleView": {"@": "computedStyleView" }, |
19 | "substitution": {"@": "substitution" }, | ||
20 | "delegate": {"@": "stylesViewDelegate"}, | 19 | "delegate": {"@": "stylesViewDelegate"}, |
21 | "toolbar": {"@": "toolbar"} | 20 | "toolbar": {"@": "toolbar"} |
22 | } | 21 | } |
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js index 157d99de..153e74b6 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js | |||
@@ -9,6 +9,21 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.StylesViewContainer = Montage.create(Component, { | 10 | exports.StylesViewContainer = Montage.create(Component, { |
11 | 11 | ||
12 | ruleListContainer: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | computedStyleView: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
21 | |||
22 | toolbar: { | ||
23 | value: null, | ||
24 | serializable: true | ||
25 | }, | ||
26 | |||
12 | _currentDocument: { | 27 | _currentDocument: { |
13 | value : null | 28 | value : null |
14 | }, | 29 | }, |
@@ -37,6 +52,10 @@ exports.StylesViewContainer = Montage.create(Component, { | |||
37 | contentPanel : { | 52 | contentPanel : { |
38 | value: 'rules' | 53 | value: 'rules' |
39 | }, | 54 | }, |
55 | selectionName: { | ||
56 | value: null, | ||
57 | serializable: true | ||
58 | }, | ||
40 | _selectionNameLabelText : { | 59 | _selectionNameLabelText : { |
41 | value: null | 60 | value: null |
42 | }, | 61 | }, |