diff options
author | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
commit | 0e1a276f19ea70009c5a649e9667861d7c346a7e (patch) | |
tree | 6db7675bbe89746ba47002bba306da42a7261312 /js/panels/css-panel | |
parent | f7e4257745ccd44b8d24555f0ef787429d6e472c (diff) | |
download | ninja-0e1a276f19ea70009c5a649e9667861d7c346a7e.tar.gz |
first iteration of adding serializable to ninja plus other changes to run the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/css-panel')
10 files changed, 67 insertions, 7 deletions
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.js b/js/panels/css-panel/css-panel.reel/css-panel.js index 96d94b36..a2a288c9 100644 --- a/js/panels/css-panel/css-panel.reel/css-panel.js +++ b/js/panels/css-panel/css-panel.reel/css-panel.js | |||
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.CssPanel = Montage.create(Component, { | 10 | exports.CssPanel = Montage.create(Component, { |
11 | 11 | ||
12 | styleSheetsView: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | stylesViewContainer: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
21 | |||
12 | _currentDocument: { | 22 | _currentDocument: { |
13 | value : null | 23 | value : null |
14 | }, | 24 | }, |
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/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html index f203b61f..9aab5649 100644 --- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html | |||
@@ -34,7 +34,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
34 | "element": {"#": "rule-selector"} | 34 | "element": {"#": "rule-selector"} |
35 | }, | 35 | }, |
36 | "bindings": { | 36 | "bindings": { |
37 | "value" : {"<<->":"@owner.selector" } | 37 | "value" : {"<->":"@owner.selector" } |
38 | } | 38 | } |
39 | }, | 39 | }, |
40 | "declaration": { | 40 | "declaration": { |
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js index c7766d08..509ca565 100644 --- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js +++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js | |||
@@ -8,6 +8,16 @@ 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.RuleListContainer = Montage.create(Component, { | 10 | exports.RuleListContainer = Montage.create(Component, { |
11 | focusDelegate: { | ||
12 | value: null, | ||
13 | serializable: true | ||
14 | }, | ||
15 | |||
16 | ruleListComponent: { | ||
17 | value: null, | ||
18 | serializable: true | ||
19 | }, | ||
20 | |||
11 | _instanceToAdd : { value: null }, | 21 | _instanceToAdd : { value: null }, |
12 | _appendElement : { value: null }, | 22 | _appendElement : { value: null }, |
13 | _lastDisplayedList : { value: null }, | 23 | _lastDisplayedList : { value: null }, |
diff --git a/js/panels/css-panel/rule-list.reel/rule-list.js b/js/panels/css-panel/rule-list.reel/rule-list.js index 3e18c3bf..27d74b2f 100644 --- a/js/panels/css-panel/rule-list.reel/rule-list.js +++ b/js/panels/css-panel/rule-list.reel/rule-list.js | |||
@@ -8,6 +8,11 @@ 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.RuleList = Montage.create(Component, { | 10 | exports.RuleList = Montage.create(Component, { |
11 | supportedRules: { | ||
12 | value: null, | ||
13 | serializable: true | ||
14 | }, | ||
15 | |||
11 | focusDelegate : { value: null }, | 16 | focusDelegate : { value: null }, |
12 | ruleNodeName : { value: 'li' }, | 17 | ruleNodeName : { value: 'li' }, |
13 | _needsScrollToBottom: { value: null }, | 18 | _needsScrollToBottom: { value: null }, |
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html index fad54453..4cdf0741 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.html +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html | |||
@@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
43 | }, | 43 | }, |
44 | "bindings": { | 44 | "bindings": { |
45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, | 45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, |
46 | "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, | 46 | "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" }, |
47 | "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, | 47 | "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" }, |
48 | "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, | 48 | "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" }, |
49 | "delegate": {"<-": "@owner.focusDelegate" } | 49 | "delegate": {"<-": "@owner.focusDelegate" } |
50 | } | 50 | } |
51 | } | 51 | } |
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js index 9e3b4a49..c090a1fc 100644 --- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js +++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js | |||
@@ -8,13 +8,24 @@ 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.StyleSheetsView = Montage.create(Component, { | 10 | exports.StyleSheetsView = Montage.create(Component, { |
11 | |||
12 | toolbar: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | styleSheetList: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
21 | |||
11 | documentLoaded : { value: false }, | 22 | documentLoaded : { value: false }, |
12 | showToolbar : { value: false }, | 23 | showToolbar : { value: false }, |
13 | stylesController : { value: null }, | 24 | stylesController : { value: null }, |
14 | styleSheets : { value: [] }, | 25 | styleSheets : { value: [] }, |
15 | _initView : { value: false }, | 26 | _initView : { value: false }, |
16 | _needsScroll : { value: false }, | 27 | _needsScroll : { value: false }, |
17 | documentNameLabel : { value: null }, | 28 | documentNameLabel : { value: null, serializable: true }, |
18 | noDocumentLabelClass : { value: "no-document" }, | 29 | noDocumentLabelClass : { value: "no-document" }, |
19 | 30 | ||
20 | _activeDocument: { | 31 | _activeDocument: { |
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 |