aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/components/toolbar.reel/toolbar.html24
-rw-r--r--js/components/toolbar.reel/toolbar.js20
-rw-r--r--js/data/panels-data.js2
-rw-r--r--js/panels/css-panel/css-panel-container.js2
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.html21
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js2
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html32
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html40
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.html11
-rw-r--r--js/panels/css-panel/rule-list.reel/rule-list.html3
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.html35
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html24
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html18
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.html24
-rw-r--r--js/panels/css-panel/styles-view-delegate.js2
15 files changed, 78 insertions, 182 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index b33c4665..d2c5972a 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -25,12 +25,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
25 "element": {"#": "repetition"} 25 "element": {"#": "repetition"}
26 }, 26 },
27 "bindings": { 27 "bindings": {
28 "objects" : { 28 "objects": {"<-": "@owner.buttons"}
29 "boundObject": {"@": "owner"},
30 "boundObjectPropertyPath": "buttons",
31 "oneway": true
32 }
33
34 } 29 }
35 }, 30 },
36 31
@@ -41,21 +36,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
41 "label": " " 36 "label": " "
42 }, 37 },
43 "bindings": { 38 "bindings": {
44 "label" : { 39 "label": {"<-": "@buttonList.objectAtCurrentIteration.title"},
45 "boundObject": {"@": "buttonList"}, 40 "sourceObject": {"<-": "@buttonList.objectAtCurrentIteration"}
46 "boundObjectPropertyPath": "objectAtCurrentIteration.title",
47 "oneway": true
48 },
49 "identifier": {
50 "boundObject": {"@": "buttonList"},
51 "boundObjectPropertyPath": "objectAtCurrentIteration.identifier",
52 "oneway": true
53 },
54 "sourceObject": {
55 "boundObject": {"@": "buttonList"},
56 "boundObjectPropertyPath": "objectAtCurrentIteration",
57 "oneway": true
58 }
59 } 41 }
60 } 42 }
61 } 43 }
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js
index 8f93aa2b..2ccdb2c5 100644
--- a/js/components/toolbar.reel/toolbar.js
+++ b/js/components/toolbar.reel/toolbar.js
@@ -11,17 +11,31 @@ exports.Toolbar = Montage.create(Component, {
11 _needsButtonProperties : { 11 _needsButtonProperties : {
12 value: null 12 value: null
13 }, 13 },
14 _sourceObject : {
15 value: null
16 },
17 sourceObject : {
18 get: function() {
19 return this._sourceObject;
20 },
21 set: function(value) {
22 if(value === this._sourceObject) { return; }
23 this._sourceObject = value;
24 },
25 serializable: true
26 },
14 leftAlignClass : { value: "left-button" }, 27 leftAlignClass : { value: "left-button" },
15 hideButtonClass : { value: "hide-button" }, 28 hideButtonClass : { value: "hide-button" },
16 _buttons : { value: null }, 29 _buttons : { value: [], distinct: true },
17 buttons : { 30 buttons : {
18 get: function() { 31 get: function() {
19 return this._buttons; 32 return this._buttons;
20 }, 33 },
21 set: function(btns) { 34 set: function(btns) {
22 this._buttons = btns; 35 this._buttons = btns;
23 this._needsButtonProperties = this.needsDraw = true;; 36 this._needsButtonProperties = this.needsDraw = true;
24 } 37 },
38 serializable: true
25 }, 39 },
26 40
27 _buttonToHide : { 41 _buttonToHide : {
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index ed346196..ffc76782 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -80,7 +80,7 @@ exports.PanelsData = Montage.create(Montage, {
80 collapsed: false, 80 collapsed: false,
81 open: true, 81 open: true,
82 modulePath: "js/panels/css-panel/css-panel.reel", 82 modulePath: "js/panels/css-panel/css-panel.reel",
83 moduleName: "CSSPanelNew" 83 moduleName: "CssPanel"
84 }, 84 },
85 { 85 {
86 name: "Presets", 86 name: "Presets",
diff --git a/js/panels/css-panel/css-panel-container.js b/js/panels/css-panel/css-panel-container.js
index 6110c999..08673309 100644
--- a/js/panels/css-panel/css-panel-container.js
+++ b/js/panels/css-panel/css-panel-container.js
@@ -6,7 +6,7 @@
6 6
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var PanelBase = require("js/panels/PanelBase").PanelBase; 8var PanelBase = require("js/panels/PanelBase").PanelBase;
9var Content = require("js/panels/css-panel/css-panel.reel").CSSPanelNew; 9var Content = require("js/panels/css-panel/css-panel.reel").CssPanel;
10 10
11exports.CSSPanelContainer = Montage.create(PanelBase, { 11exports.CSSPanelContainer = Montage.create(PanelBase, {
12 panelName : { value: "CSS Panel" }, 12 panelName : { value: "CSS Panel" },
diff --git a/js/panels/css-panel/css-panel.reel/css-panel.html b/js/panels/css-panel/css-panel.reel/css-panel.html
index 54bb1fae..42dca8a2 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.html
+++ b/js/panels/css-panel/css-panel.reel/css-panel.html
@@ -11,8 +11,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module" : "js/panels/css-panel/css-panel.reel", 14 "prototype" : "js/panels/css-panel/css-panel.reel",
15 "name" : "CSSPanelNew",
16 "properties" : { 15 "properties" : {
17 "element" : {"#" : "container"}, 16 "element" : {"#" : "container"},
18 "styleSheetsView": {"@": "styleSheetsView"}, 17 "styleSheetsView": {"@": "styleSheetsView"},
@@ -21,16 +20,14 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
21 }, 20 },
22 21
23 "styleSheetsView": { 22 "styleSheetsView": {
24 "module" : "js/panels/css-panel/style-sheets-view.reel", 23 "prototype" : "js/panels/css-panel/style-sheets-view.reel",
25 "name": "StyleSheetsView",
26 "properties": { 24 "properties": {
27 "element": {"#": "style-sheet-view" }, 25 "element": {"#": "style-sheet-view" },
28 "documentNameLabel": {"#": "document-name" } 26 "documentNameLabel": {"#": "document-name" }
29 } 27 }
30 }, 28 },
31 "stylesViewContainer": { 29 "stylesViewContainer": {
32 "module" : "js/panels/css-panel/styles-view-container.reel", 30 "prototype" : "js/panels/css-panel/styles-view-container.reel",
33 "name": "StylesViewContainer",
34 "properties": { 31 "properties": {
35 "element": {"#": "styles-view-container" }, 32 "element": {"#": "styles-view-container" },
36 "selectionName": {"@": "selectionName" } 33 "selectionName": {"@": "selectionName" }
@@ -42,22 +39,18 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
42 "element": {"#":"selection-name"} 39 "element": {"#":"selection-name"}
43 }, 40 },
44 "bindings": { 41 "bindings": {
45 "value" : { 42 "value" : {"<-": "@stylesViewContainer.selectionNameLabelText" }
46 "boundObject": {"@": "stylesViewContainer"},
47 "boundObjectPropertyPath": "selectionNameLabelText",
48 "oneway": true
49 }
50 } 43 }
51 } 44 }
52 } 45 }
53 </script> 46 </script>
54</head> 47</head>
55<body> 48<body>
56<section id="container" class="css-panel"> 49<section data-montage-id="container" class="css-panel">
57 <h3>Style Sheets <span data-montage-id="document-name" class="document-name"></span></h3> 50 <h3>Style Sheets <span data-montage-id="document-name" class="document-name"></span></h3>
58 <div id="style-sheet-view"></div> 51 <div data-montage-id="style-sheet-view"></div>
59 <h3>Styles <span data-montage-id="selection-name" class="selection-name"></span></h3> 52 <h3>Styles <span data-montage-id="selection-name" class="selection-name"></span></h3>
60 <div id="styles-view-container"></div> 53 <div data-montage-id="styles-view-container"></div>
61</section> 54</section>
62</body> 55</body>
63</html> \ No newline at end of file 56</html> \ No newline at end of file
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 4a2062af..a117787e 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.js
+++ b/js/panels/css-panel/css-panel.reel/css-panel.js
@@ -7,7 +7,7 @@
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.CSSPanelNew = Montage.create(Component, { 10exports.CssPanel = Montage.create(Component, {
11 prepareForDraw : { 11 prepareForDraw : {
12 value: function() { 12 value: function() {
13 }