From 0e1a276f19ea70009c5a649e9667861d7c346a7e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 6 Jun 2012 00:25:27 -0700 Subject: first iteration of adding serializable to ninja plus other changes to run the latest montage Signed-off-by: Valerio Virgillito --- js/panels/css-panel/css-panel.reel/css-panel.js | 10 ++++++++++ js/panels/css-panel/css-style.reel/css-style.html | 2 +- .../css-style-rule.reel/css-style-rule.html | 2 +- .../rule-list-container.reel/rule-list-container.js | 10 ++++++++++ js/panels/css-panel/rule-list.reel/rule-list.js | 5 +++++ .../style-declaration.reel/style-declaration.html | 6 +++--- .../style-sheets-view.reel/style-sheets-view.js | 13 ++++++++++++- .../styles-view-container.html | 1 - .../styles-view-container.js | 19 +++++++++++++++++++ js/panels/css-panel/styles-view-delegate.js | 6 ++++++ 10 files changed, 67 insertions(+), 7 deletions(-) (limited to 'js/panels/css-panel') 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, exports.CssPanel = Montage.create(Component, { + styleSheetsView: { + value: null, + serializable: true + }, + + stylesViewContainer: { + value: null, + serializable: true + }, + _currentDocument: { value : null }, 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 "checked": true }, "bindings": { - "checked" : {"<<->": "@owner.enabled" } + "checked" : {"<->": "@owner.enabled" } } }, "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 "element": {"#": "rule-selector"} }, "bindings": { - "value" : {"<<->":"@owner.selector" } + "value" : {"<->":"@owner.selector" } } }, "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, Component = require("montage/ui/component").Component; exports.RuleListContainer = Montage.create(Component, { + focusDelegate: { + value: null, + serializable: true + }, + + ruleListComponent: { + value: null, + serializable: true + }, + _instanceToAdd : { value: null }, _appendElement : { value: null }, _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, Component = require("montage/ui/component").Component; exports.RuleList = Montage.create(Component, { + supportedRules: { + value: null, + serializable: true + }, + focusDelegate : { value: null }, ruleNodeName : { value: 'li' }, _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 }, "bindings": { "source": {"<-": "@repetition.objectAtCurrentIteration" }, - "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, - "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, - "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, + "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" }, + "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" }, + "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" }, "delegate": {"<-": "@owner.focusDelegate" } } } 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, Component = require("montage/ui/component").Component; exports.StyleSheetsView = Montage.create(Component, { + + toolbar: { + value: null, + serializable: true + }, + + styleSheetList: { + value: null, + serializable: true + }, + documentLoaded : { value: false }, showToolbar : { value: false }, stylesController : { value: null }, styleSheets : { value: [] }, _initView : { value: false }, _needsScroll : { value: false }, - documentNameLabel : { value: null }, + documentNameLabel : { value: null, serializable: true }, noDocumentLabelClass : { value: "no-document" }, _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 "element" : {"#" : "container"}, "ruleListContainer": {"@": "ruleListContainer" }, "computedStyleView": {"@": "computedStyleView" }, - "substitution": {"@": "substitution" }, "delegate": {"@": "stylesViewDelegate"}, "toolbar": {"@": "toolbar"} } 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, exports.StylesViewContainer = Montage.create(Component, { + ruleListContainer: { + value: null, + serializable: true + }, + + computedStyleView: { + value: null, + serializable: true + }, + + toolbar: { + value: null, + serializable: true + }, + _currentDocument: { value : null }, @@ -37,6 +52,10 @@ exports.StylesViewContainer = Montage.create(Component, { contentPanel : { value: 'rules' }, + selectionName: { + value: null, + serializable: true + }, _selectionNameLabelText : { value: null }, diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index 87686826..a7c1f0d9 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js @@ -9,6 +9,12 @@ var Montage = require("montage/core/core").Montage, Keyboard = require("js/mediators/keyboard-mediator").Keyboard; exports.StylesViewDelegate = Montage.create(Component, { + + ruleListContainer: { + value: null, + serializable: true + }, + newClassPrefix : { value: "new-class" }, elementOutlineClass : { value: "nj-element-highlight" }, -- cgit v1.2.3 From 1b510d86ebdd3cb58162e20cb9412e93d6f473c1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 11 Jun 2012 23:47:29 -0700 Subject: adding more missing properties Signed-off-by: Valerio Virgillito --- .../css-panel/style-sheet.reel/style-sheet.js | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'js/panels/css-panel') diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.js b/js/panels/css-panel/style-sheet.reel/style-sheet.js index cb69d25b..8ce8da0e 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.js +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.js @@ -8,6 +8,37 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; exports.StyleSheet = Montage.create(Component, { + + nameText: { + value: null, + serializable: true + }, + + mediaInput: { + value: null, + serializable: true + }, + + editButton: { + value: null, + serializable: true + }, + + editView: { + value: null, + serializable: true + }, + + disableButton: { + value: null, + serializable: true + }, + + deleteButton: { + value: null, + serializable: true + }, + _translateDistance: { value: null }, -- cgit v1.2.3 From 964484bc244dda21c6646f4c0d400d6c137ff442 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 11:04:46 -0700 Subject: fixing a default property Signed-off-by: Valerio Virgillito --- js/panels/css-panel/style-sheet.reel/style-sheet.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels/css-panel') diff --git a/js/panels/css-panel/style-sheet.reel/style-sheet.html b/js/panels/css-panel/style-sheet.reel/style-sheet.html index 7e27dd93..d08453fa 100644 --- a/js/panels/css-panel/style-sheet.reel/style-sheet.html +++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html @@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot "properties": { "element": {"#": "sheet-name"}, "identifier": "nameText", - "defaultText": "Style sheet" + "defaultValue": "Style sheet" }, "bindings": { "value": {"<-": "@owner.name"} -- cgit v1.2.3 From 471776facca730c57b0f6b8448535914df6624fd Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 11:12:32 -0700 Subject: adding more nonexistent properties Signed-off-by: Valerio Virgillito --- js/panels/css-panel/css-style.reel/css-style.js | 4 ++++ .../css-style-rule.reel/css-style-rule.html | 21 --------------------- .../css-style-rule.reel/css-style-rule.js | 5 +++++ 3 files changed, 9 insertions(+), 21 deletions(-) (limited to 'js/panels/css-panel') 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..29b3b34d 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,10 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; exports.CssStyle = Montage.create(Component, { + declaration: { + value: null + }, + delegate : { value: null }, disabledClass : { value: 'style-item-disabled' }, editingStyleClass : { value: 'edit-style-item' }, 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 9aab5649..8b0c3101 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 @@ -56,27 +56,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot } } -
  • diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js index 54181bf3..5361e5cc 100644 --- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js @@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage, Component = require("montage/ui/component").Component; exports.CssStyleRule = Montage.create(Component, { + + selectorField: { + value: null + }, + addClassNameOnChange : { value: null }, -- cgit v1.2.3 From 9d85430967237bd01334212de6f04db3bd222148 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 11:21:21 -0700 Subject: adding more missing properties to the serialization Signed-off-by: Valerio Virgillito --- js/panels/css-panel/css-style.reel/css-style.js | 17 +++++++++++++++++ .../style-declaration.reel/style-declaration.js | 12 ++++++++++++ 2 files changed, 29 insertions(+) (limited to 'js/panels/css-panel') 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 29b3b34d..294d49a9 100644 --- a/js/panels/css-panel/css-style.reel/css-style.js +++ b/js/panels/css-panel/css-style.reel/css-style.js @@ -12,6 +12,23 @@ exports.CssStyle = Montage.create(Component, { value: null }, + addStyleButton: { + value: null, + serializable: true + }, + + propertyField: { + value: null + }, + + valueField: { + value: null + }, + + propertyNames: { + value: null + }, + delegate : { value: null }, disabledClass : { value: 'style-item-disabled' }, editingStyleClass : { value: 'edit-style-item' }, diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.js b/js/panels/css-panel/style-declaration.reel/style-declaration.js index 6187989b..b9205ba7 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.js +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.js @@ -9,6 +9,18 @@ var Montage = require("montage/core/core").Montage, ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map"); exports.StyleDeclaration = Montage.create(Component, { + arrayController: { + value: null + }, + + styleComponent: { + value: null + }, + + repetition: { + value: null + }, + cssText : { value: null }, focusDelegate : { value: null }, needsSort : { value: null }, -- cgit v1.2.3