aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/css-panel/styles-view-container.reel/styles-view-container.js
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-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/styles-view-container.reel/styles-view-container.js')
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js19
1 files changed, 19 insertions, 0 deletions
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
10exports.StylesViewContainer = Montage.create(Component, { 10exports.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 },