aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 15:11:40 -0700
committerEric Guzman2012-05-10 15:11:40 -0700
commitb52222a0e165825bf507b4f69b33d51c84eb85d4 (patch)
tree29677df29357c9aa373fa54581f215929098742b
parent39f23ad4868482f395d2e210490a2d73545a9d84 (diff)
downloadninja-b52222a0e165825bf507b4f69b33d51c84eb85d4.tar.gz
CSS Panel - Fix errors from new Montage and remove logs.
Diffstat
-rw-r--r--js/components/toolbar.reel/toolbar.js3
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js6
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.html18
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html12
4 files changed, 18 insertions, 21 deletions
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js
index dbff2db6..bc3cbd08 100644
--- a/js/components/toolbar.reel/toolbar.js
+++ b/js/components/toolbar.reel/toolbar.js
@@ -21,7 +21,6 @@ exports.Toolbar = Montage.create(Component, {
21 set: function(btns) { 21 set: function(btns) {
22 this._buttons = btns; 22 this._buttons = btns;
23 this._needsButtonProperties = true; 23 this._needsButtonProperties = true;
24 console.log("buttons set");
25 } 24 }
26 }, 25 },
27 26
@@ -64,7 +63,6 @@ exports.Toolbar = Montage.create(Component, {
64 63
65 prepareForDraw : { 64 prepareForDraw : {
66 value: function() { 65 value: function() {
67 console.log("toolbar - prepare for draw");
68 if(this._needsButtonProperties) { 66 if(this._needsButtonProperties) {
69 this.repetition.childComponents.forEach(function(button) { 67 this.repetition.childComponents.forEach(function(button) {
70 button.identifier = button.sourceObject.identifier; 68 button.identifier = button.sourceObject.identifier;
@@ -75,7 +73,6 @@ exports.Toolbar = Montage.create(Component, {
75 }, 73 },
76 draw : { 74 draw : {
77 value: function() { 75 value: function() {
78 console.log("toolbar - draw - repetition ", this.repetition);
79 if(this._needsClass) { 76 if(this._needsClass) {
80 77
81 this.repetition.childComponents.forEach(function(button) { 78 this.repetition.childComponents.forEach(function(button) {
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 b6e9613b..4a2062af 100644
--- a/js/panels/css-panel/css-panel.reel/css-panel.js
+++ b/js/panels/css-panel/css-panel.reel/css-panel.js
@@ -8,18 +8,12 @@ var 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.CSSPanelNew = Montage.create(Component, {
11
12
13 prepareForDraw : { 11 prepareForDraw : {
14 value: function() { 12 value: function() {
15 console.log("css panel : prepare for draw");
16 } 13 }
17 }, 14 },
18 draw : { 15 draw : {
19 value: function() { 16 value: function() {
20 console.log("css panel : draw. height: ", this.height);
21
22
23 } 17 }
24 } 18 }
25}); 19});
diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.html b/js/panels/css-panel/rule-list-container.reel/rule-list-container.html
index 8f816d28..809f9bfe 100644
--- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.html
+++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.html
@@ -23,12 +23,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
23 "properties": { 23 "properties": {
24 "supportedRules" : { 24 "supportedRules" : {
25 "inline": {"@": "cssStyleRule" }, 25 "inline": {"@": "cssStyleRule" },
26 "1" : {"@": "cssStyleRule"}, 26 "1" : {"@": "cssStyleRule"}
27 "3" : {"@": "cssImportRule"},
28 "4" : {"@": "cssMediaRule"},
29 "5" : {"@": "cssFontFaceRule"},
30 "6" : {"@": "cssPageRule"},
31 "10" : {"@": "namespaceRule"}
32 } 27 }
33 } 28 }
34 }, 29 },
@@ -38,6 +33,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
38 } 33 }
39 } 34 }
40 </script> 35 </script>
36 <script type="text/json">
37 "supportedRules" : {
38 "inline": {"@": "cssStyleRule" },
39 "1" : {"@": "cssStyleRule"},
40 "3" : {"@": "cssImportRule"},
41 "4" : {"@": "cssMediaRule"},
42 "5" : {"@": "cssFontFaceRule"},
43 "6" : {"@": "cssPageRule"},
44 "10" : {"@": "namespaceRule"}
45 }
46 </script>
41</head> 47</head>
42<body> 48<body>
43<div id="container" class="rule-list-container"></div> 49<div id="container" class="rule-list-container"></div>
diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
index 484d3c04..d01d40e0 100644
--- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
+++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.html
@@ -120,13 +120,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
120 </script> 120 </script>
121</head> 121</head>
122<body> 122<body>
123<div id="style-sheets-view-container" class="style-sheets-view-container"> 123<div data-montage-id="style-sheets-view-container" class="style-sheets-view-container">
124 <h4 id="no-document-message" class="panel-message">No style sheets to display.</h4> 124 <h4 data-montage-id="no-document-message" class="panel-message">No style sheets to display.</h4>
125 <ul id="sheet-list" class="sheet-list"> 125 <ul data-montage-id="sheet-list" class="sheet-list">
126 <li><div id="sheet-item"></div></li> 126 <li><div data-montage-id="sheet-item"></div></li>
127 </ul> 127 </ul>
128 <div id="style-sheets-toolbar-container" class="style-sheets-toolbar-container"> 128 <div data-montage-id="style-sheets-toolbar-container" class="style-sheets-toolbar-container">
129 <div id="style-sheets-toolbar"></div> 129 <div data-montage-id="style-sheets-toolbar"></div>
130 </div> 130 </div>
131 <div data-montage-id="resizeBar" class="sub-panel-resizer"></div> 131 <div data-montage-id="resizeBar" class="sub-panel-resizer"></div>
132</div> 132</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 16:09:46 +0000