diff options
| author | Eric Guzman | 2012-05-21 09:30:24 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-21 09:30:24 -0700 |
| commit | a8e97144c832e355de7f8177ce38644119248e87 (patch) | |
| tree | 14d7c03648347019b34c37f789c48d5554d77f1e /js/components | |
| parent | 84097be9d7dd3403a0ac12f8c039d3ffc5281cfc (diff) | |
| download | ninja-a8e97144c832e355de7f8177ce38644119248e87.tar.gz | |
Style sheets view - Fixed drawing of toolbar and "no sheets" message
Diffstat (limited to 'js/components')
| -rw-r--r-- | js/components/toolbar.reel/toolbar.html | 8 | ||||
| -rw-r--r-- | js/components/toolbar.reel/toolbar.js | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index 53c6627a..b33c4665 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.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/style-sheet.reel", | 14 | "prototype" : "js/components/toolbar.reel", |
| 15 | "name" : "StyleSheet", | ||
| 16 | "properties" : { | 15 | "properties" : { |
| 17 | "element" : {"#" : "toolbar-container"}, | 16 | "element" : {"#" : "toolbar-container"}, |
| 18 | "repetition": {"@": "buttonList" } | 17 | "repetition": {"@": "buttonList" } |
| @@ -36,8 +35,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 36 | }, | 35 | }, |
| 37 | 36 | ||
| 38 | "button": { | 37 | "button": { |
| 39 | "module": "montage/ui/button.reel", | 38 | "prototype": "montage/ui/button.reel", |
| 40 | "name": "Button", | ||
| 41 | "properties": { | 39 | "properties": { |
| 42 | "element": {"#": "button" }, | 40 | "element": {"#": "button" }, |
| 43 | "label": " " | 41 | "label": " " |
| @@ -64,7 +62,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 64 | </script> | 62 | </script> |
| 65 | </head> | 63 | </head> |
| 66 | <body> | 64 | <body> |
| 67 | <div id="toolbar-container" class="toolbar-container"> | 65 | <div data-montage-id="toolbar-container" class="toolbar-container"> |
| 68 | <ul data-montage-id="repetition"> | 66 | <ul data-montage-id="repetition"> |
| 69 | <li><button data-montage-id="button" class="toolbar-button"></button></li> | 67 | <li><button data-montage-id="button" class="toolbar-button"></button></li> |
| 70 | </ul> | 68 | </ul> |
diff --git a/js/components/toolbar.reel/toolbar.js b/js/components/toolbar.reel/toolbar.js index bc3cbd08..8f93aa2b 100644 --- a/js/components/toolbar.reel/toolbar.js +++ b/js/components/toolbar.reel/toolbar.js | |||
| @@ -20,7 +20,7 @@ exports.Toolbar = Montage.create(Component, { | |||
| 20 | }, | 20 | }, |
| 21 | set: function(btns) { | 21 | set: function(btns) { |
| 22 | this._buttons = btns; | 22 | this._buttons = btns; |
| 23 | this._needsButtonProperties = true; | 23 | this._needsButtonProperties = this.needsDraw = true;; |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, |
| 26 | 26 | ||