diff options
Diffstat (limited to 'js/panels')
5 files changed, 8 insertions, 10 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index 5937b58f..6ffb5da4 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html | |||
| @@ -6,6 +6,9 @@ | |||
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html lang="en"> | 7 | <html lang="en"> |
| 8 | <head> | 8 | <head> |
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | <link rel="stylesheet" type="text/css" href="panel.css"> | ||
| 11 | |||
| 9 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 10 | { | 13 | { |
| 11 | "Resizer": { | 14 | "Resizer": { |
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index e6b7a6e3..46f91410 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
| @@ -98,11 +98,6 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
| 98 | "text": "Textfield", | 98 | "text": "Textfield", |
| 99 | "dataFile" : "node_modules/components-data/textfield.json", | 99 | "dataFile" : "node_modules/components-data/textfield.json", |
| 100 | "component": "textfield" | 100 | "component": "textfield" |
| 101 | }, | ||
| 102 | { | ||
| 103 | "text": "Toggle Button", | ||
| 104 | "dataFile" : "node_modules/components-data/toggle-button.json", | ||
| 105 | "component": "toggleButton" | ||
| 106 | } | 101 | } |
| 107 | ] | 102 | ] |
| 108 | } | 103 | } |
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 0f16b3d8..52d8b830 100644 --- a/js/panels/css-panel/css-style.reel/css-style.html +++ b/js/panels/css-panel/css-style.reel/css-style.html | |||
| @@ -24,7 +24,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 24 | "object": "js/panels/CSSPanel/css-property-name-list" | 24 | "object": "js/panels/CSSPanel/css-property-name-list" |
| 25 | }, | 25 | }, |
| 26 | "checkbox": { | 26 | "checkbox": { |
| 27 | "prototype": "montage/ui/checkbox.reel", | 27 | "prototype": "montage/ui/input-checkbox.reel", |
| 28 | "properties": { | 28 | "properties": { |
| 29 | "element": {"#": "disable-checkbox"}, | 29 | "element": {"#": "disable-checkbox"}, |
| 30 | "checked": true | 30 | "checked": true |
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index a737bd39..72984c17 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.html | |||
| @@ -11,21 +11,21 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "elementName": { | 13 | "elementName": { |
| 14 | "prototype": "montage/ui/textfield.reel", | 14 | "prototype": "montage/ui/native/input-text.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "elementName"} | 16 | "element": {"#": "elementName"} |
| 17 | } | 17 | } |
| 18 | }, | 18 | }, |
| 19 | 19 | ||
| 20 | "elementId": { | 20 | "elementId": { |
| 21 | "prototype": "montage/ui/textfield.reel", | 21 | "prototype": "montage/ui/native/input-text.reel", |
| 22 | "properties": { | 22 | "properties": { |
| 23 | "element": {"#": "elementId"} | 23 | "element": {"#": "elementId"} |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, |
| 26 | 26 | ||
| 27 | "elementClass": { | 27 | "elementClass": { |
| 28 | "prototype": "montage/ui/textfield.reel", | 28 | "prototype": "montage/ui/native/input-text.reel", |
| 29 | "properties": { | 29 | "properties": { |
| 30 | "element": {"#": "elementClass"} | 30 | "element": {"#": "elementClass"} |
| 31 | } | 31 | } |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 572e5a60..259e9ab5 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
| @@ -232,7 +232,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 232 | } | 232 | } |
| 233 | }, | 233 | }, |
| 234 | "flattenCheckbox": { | 234 | "flattenCheckbox": { |
| 235 | "prototype": "montage/ui/checkbox.reel", | 235 | "prototype": "montage/ui/input-checkbox.reel", |
| 236 | "properties": { | 236 | "properties": { |
| 237 | "element": {"#": "flattenCh"}, | 237 | "element": {"#": "flattenCh"}, |
| 238 | "identifier": "flatten", | 238 | "identifier": "flatten", |