aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:04:25 -0700
committerArmen Kesablyan2012-06-20 15:04:25 -0700
commitfc818d31de267d2b77fda3b3029ad38d48698be8 (patch)
tree122ebf54d3378578c1ded4d786ba3940d4a911d2 /js/panels
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-fc818d31de267d2b77fda3b3029ad38d48698be8.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Panel.reel/Panel.html2
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js5
-rw-r--r--js/panels/css-panel/css-style.reel/css-style.html2
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html2
-rw-r--r--js/panels/css-panel/style-sheet.reel/style-sheet.html6
-rwxr-xr-xjs/panels/properties.reel/properties.html6
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
7 files changed, 11 insertions, 14 deletions
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 5937b58f..80fd1a13 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -6,6 +6,8 @@
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
9 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
10 { 12 {
11 "Resizer": { 13 "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..4e670cdc 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/native/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/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 8b0c3101..99021917 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
@@ -49,7 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
49 } 49 }
50 }, 50 },
51 "sheetLink": { 51 "sheetLink": {
52 "prototype": "montage/ui/anchor.reel", 52 "prototype": "montage/ui/native/anchor.reel",
53 "properties": { 53 "properties": {
54 "element": {"#": "style-sheet-name"} 54 "element": {"#": "style-sheet-name"}
55 } 55 }
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 d08453fa..4f17c0fb 100644
--- a/js/panels/css-panel/style-sheet.reel/style-sheet.html
+++ b/js/panels/css-panel/style-sheet.reel/style-sheet.html
@@ -40,7 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
40 } 40 }
41 }, 41 },
42 "editButton": { 42 "editButton": {
43 "prototype": "montage/ui/button.reel", 43 "prototype": "montage/ui/native/button.reel",
44 "properties": { 44 "properties": {
45 "element": {"#": "edit-button"}, 45 "element": {"#": "edit-button"},
46 "identifier": "editButton", 46 "identifier": "editButton",
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
53 53
54 }, 54 },
55 "disableButton": { 55 "disableButton": {
56 "prototype": "montage/ui/button.reel", 56 "prototype": "montage/ui/native/button.reel",
57 "properties": { 57 "properties": {
58 "element": {"#": "disable-button"}, 58 "element": {"#": "disable-button"},
59 "identifier": "disableButton", 59 "identifier": "disableButton",
@@ -66,7 +66,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
66 66
67 }, 67 },
68 "deleteButton": { 68 "deleteButton": {
69 "prototype": "montage/ui/button.reel", 69 "prototype": "montage/ui/native/button.reel",
70 "properties": { 70 "properties": {
71 "element": {"#": "delete-button"}, 71 "element": {"#": "delete-button"},
72 "identifier": "deleteButton", 72 "identifier": "deleteButton",
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",
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:25:18 +0000