From ad6f78493295c9c7b4c11cd6a895dd5cc8e207f7 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Sun, 17 Jun 2012 22:58:26 -0700
Subject: updating the components and descriptor.json to support montage v.11

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/css-panel/css-style.reel/css-style.html                   | 2 +-
 js/panels/properties.reel/properties.html                           | 6 +++---
 .../properties.reel/sections/three-d-view.reel/three-d-view.html    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'js/panels')

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
                 "object": "js/panels/CSSPanel/css-property-name-list"
             },
             "checkbox": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "disable-checkbox"},
                     "checked": true
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index a737bd39..9fa24e15 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -11,21 +11,21 @@
         <script type="text/montage-serialization">
         {
             "elementName": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/input-text.reel",
                 "properties": {
                     "element": {"#": "elementName"}
                 }
             },
 
             "elementId": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/input-text.reel",
                 "properties": {
                     "element": {"#": "elementId"}
                 }
             },
 
             "elementClass": {
-                "prototype": "montage/ui/textfield.reel",
+                "prototype": "montage/ui/input-text.reel",
                 "properties": {
                     "element": {"#": "elementClass"}
                 }
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
             }
         },
         "flattenCheckbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "flattenCh"},
                 "identifier": "flatten",
-- 
cgit v1.2.3


From 15c01942bf3232c8a3240fab5ba2f358d814b654 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 18 Jun 2012 22:47:18 -0700
Subject: fixing the components.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/components-panel.reel/components-panel.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'js/panels')

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, {
                             "text": "Textfield",
                             "dataFile" : "node_modules/components-data/textfield.json",
                             "component": "textfield"
-                        },
-                        {
-                            "text": "Toggle Button",
-                            "dataFile" : "node_modules/components-data/toggle-button.json",
-                            "component": "toggleButton"
                         }
                     ]
                 }
-- 
cgit v1.2.3


From 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 18 Jun 2012 23:07:34 -0700
Subject: fixing the css bugs with montage v11

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Panel.reel/Panel.html           | 3 +++
 js/panels/properties.reel/properties.html | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'js/panels')

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 @@
  </copyright> -->
 <html lang="en">
 <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="panel.css">
+
     <script type="text/montage-serialization">
         {
             "Resizer": {
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 9fa24e15..72984c17 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -11,21 +11,21 @@
         <script type="text/montage-serialization">
         {
             "elementName": {
-                "prototype": "montage/ui/input-text.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementName"}
                 }
             },
 
             "elementId": {
-                "prototype": "montage/ui/input-text.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementId"}
                 }
             },
 
             "elementClass": {
-                "prototype": "montage/ui/input-text.reel",
+                "prototype": "montage/ui/native/input-text.reel",
                 "properties": {
                     "element": {"#": "elementClass"}
                 }
-- 
cgit v1.2.3


From 9551b32e62798eafc2189d1d413bae330b47d356 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 20 Jun 2012 11:21:21 -0700
Subject: fixing the last instances of the old montage components in the css
 panel

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/css-panel/css-style.reel/css-style.html                   | 2 +-
 .../rule-components/css-style-rule.reel/css-style-rule.html         | 2 +-
 js/panels/css-panel/style-sheet.reel/style-sheet.html               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'js/panels')

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 52d8b830..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
                 "object": "js/panels/CSSPanel/css-property-name-list"
             },
             "checkbox": {
-                "prototype": "montage/ui/input-checkbox.reel",
+                "prototype": "montage/ui/native/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "disable-checkbox"},
                     "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
                 }
             },
             "sheetLink": {
-                "prototype": "montage/ui/anchor.reel",
+                "prototype": "montage/ui/native/anchor.reel",
                 "properties": {
                     "element": {"#": "style-sheet-name"}
                 }
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
                 }
             },
             "editButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "edit-button"},
                     "identifier": "editButton",
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
             },
             "disableButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "disable-button"},
                     "identifier": "disableButton",
@@ -66,7 +66,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
             },
             "deleteButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "delete-button"},
                     "identifier": "deleteButton",
-- 
cgit v1.2.3


From bb344a3abfe265da94a2a44518bc2e6f513c9621 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 20 Jun 2012 11:39:37 -0700
Subject: remove the un-used css file

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/Panel.reel/Panel.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 6ffb5da4..80fd1a13 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -7,8 +7,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="panel.css">
-
+    
     <script type="text/montage-serialization">
         {
             "Resizer": {
-- 
cgit v1.2.3