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>
---
 .../code-editor-view-options.html                              |  2 +-
 .../tools-properties/fill-properties.reel/fill-properties.html |  4 ++--
 .../ink-bottle-properties.reel/ink-bottle-properties.html      | 10 +++++-----
 js/components/ui/label-checkbox.reel/label-checkbox.html       |  2 +-
 js/io/system/ninjalibrary.json                                 |  2 +-
 .../ui/file-picker/file-input-field.reel/file-input-field.html |  2 +-
 .../new-file-location.reel/new-file-location.html              |  2 +-
 js/io/ui/save-as-dialog.reel/save-as-dialog.html               |  2 +-
 js/panels/css-panel/css-style.reel/css-style.html              |  2 +-
 js/panels/properties.reel/properties.html                      |  6 +++---
 .../sections/three-d-view.reel/three-d-view.html               |  2 +-
 js/stage/stage.reel/stage.html                                 |  2 +-
 js/tools/TextTool.js                                           |  2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'js')

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 2c91ca13..4448e1f1 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "codeComplete"}
             },
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html
index ca447b8b..cf68520f 100755
--- a/js/components/tools-properties/fill-properties.reel/fill-properties.html
+++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useFillColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useFillColor"},
                     "identifier": "useFillColor",
@@ -21,7 +21,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
index 5620eed8..579930f0 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html
@@ -12,7 +12,7 @@
         <script type="text/montage-serialization">
         {
             "useStrokeColor": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeColor"},
                     "identifier": "useStrokeColor",
@@ -21,7 +21,7 @@
             },
 
             "useBorderWidth": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderWidth"},
                     "identifier": "useBorderWidth",
@@ -49,7 +49,7 @@
             },
 
             "useBorderStyle": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useBorderStyle"},
                     "identifier": "useBorderStyle",
@@ -65,7 +65,7 @@
             },
 
             "useStrokeSize": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useStrokeSize"},
                     "identifier": "useStrokeSize",
@@ -94,7 +94,7 @@
             },
 
             "useWebGL": {
-                "prototype": "montage/ui/checkbox.reel",
+                "prototype": "montage/ui/input-checkbox.reel",
                 "properties": {
                     "element": {"#": "useWebGL"},
                     "identifier": "useWebGL",
diff --git a/js/components/ui/label-checkbox.reel/label-checkbox.html b/js/components/ui/label-checkbox.reel/label-checkbox.html
index 0efc7ae0..d39fca9b 100755
--- a/js/components/ui/label-checkbox.reel/label-checkbox.html
+++ b/js/components/ui/label-checkbox.reel/label-checkbox.html
@@ -20,7 +20,7 @@
         },
 
         "checkbox": {
-            "prototype": "montage/ui/checkbox.reel",
+            "prototype": "montage/ui/input-checkbox.reel",
             "properties": {
                 "element": {"#": "checkbox"},
                 "checked": false
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index fb108937..2e91b479 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
 	"libraries": [
-		{"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.1.0"},
+		{"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"},
 		{"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.0"}
 	]
 }
\ No newline at end of file
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index c3209654..ff165f9a 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -12,7 +12,7 @@
     {
 
         "newFileDirectory": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileDirectory"}
             }
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index f9a42887..0c410a47 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -56,7 +56,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index dcdb073f..99f98ddb 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -18,7 +18,7 @@
         },
 
         "newFileName": {
-            "prototype": "montage/ui/textfield.reel",
+            "prototype": "montage/ui/input-text.reel",
             "properties": {
                 "element": {"#": "newFileName"}
             }
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",
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 7a9619cd..2ed596f3 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -31,7 +31,7 @@
             },
 
             "textTool": {
-                "prototype": "node_modules/labs/rich-text-editor.reel",
+                "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
                 "properties": {
                     "element" : {"#": "textToolObject"}
                 }
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 024a92ce..0aef6c1c 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool,
-    RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor,
+    //RichTextEditor = ("node_modules/labs/rich-text-editor.reel").RichTextEditor,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.TextTool = Montage.create(DrawingTool, {
-- 
cgit v1.2.3


From f47dace72a81cddfa29d89540629cfdd76d54b18 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Mon, 18 Jun 2012 11:36:20 -0700
Subject: Fixed - IKNINJA-1313 - File menu drop down should close when New File
 dialog is opened

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/menu/menu-entry.reel/menu-entry.js | 4 ++--
 js/components/menu/menu.reel/menu.js             | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'js')

diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..ae3469c6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -83,7 +83,7 @@ exports.MenuEntry = Montage.create(Component, {
         }
     },
 
-    handleClick: {
+    captureMousedown: {
         value: function(event) {
             // TODO: Hack! Rework this!
             this.parentComponent.ownerComponent.toggleActivation(this);
@@ -105,7 +105,7 @@ exports.MenuEntry = Montage.create(Component, {
 
             this.topHeaderText.innerHTML = this.data.header;
 
-            this.element.addEventListener("click", this, false);
+            this.element.addEventListener("mousedown", this, true);
 
             Object.defineBinding(this, "menuIsActive", {
                 boundObject: this._menu,
diff --git a/js/components/menu/menu.reel/menu.js b/js/components/menu/menu.reel/menu.js
index 50d3f0bc..1560100a 100755
--- a/js/components/menu/menu.reel/menu.js
+++ b/js/components/menu/menu.reel/menu.js
@@ -83,19 +83,12 @@ exports.Menu = Montage.create(Component, {
 
     handleMousedown: {
         value: function(evt) {
-
             if(this.active && (this.getZIndex(evt.target) < 9000 || evt.target.id === "topMenu")) {
                 this._activeEntry.deselect();
                 this._activeEntry = null;
                 this.active = false;
-
-                //console.log(this.rep.objects[1]);
-                //this.controller.content[1].header = "BLAH";
+                this.element.ownerDocument.removeEventListener('mousedown', this, false);
             }
-
-//            console.log(evt.target.style['z-index']);
-//            console.log(this.getZIndex(evt.target));
-
         }
     },
 
-- 
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')

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/components/layout/bread-crumb.reel/bread-crumb.html       | 2 +-
 js/components/layout/document-entry.reel/document-entry.html | 2 +-
 js/panels/Panel.reel/Panel.html                              | 3 +++
 js/panels/properties.reel/properties.html                    | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 68f3be2b..ee314628 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -21,7 +21,7 @@
                 },
 
                 "breadCrumbButton": {
-                    "prototype": "montage/ui/button.reel",
+                    "prototype": "montage/ui/native/button.reel",
                     "properties": {
                         "element": {"#": "breadcrumb_button"}
                     },
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index e68d17c5..ebaa4ccd 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -20,7 +20,7 @@
             },
 
             "closeButton": {
-                "prototype": "montage/ui/button.reel",
+                "prototype": "montage/ui/native/button.reel",
                 "properties": {
                     "element": {"#": "close-btn"},
                     "identifier": "closeButton"
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 0f59f00621c371ccee6793c57e17314d0a5a8fbe Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 19 Jun 2012 10:55:36 -0700
Subject: Fix for IKNINJA-1754 (CLONE) - Menu Component: Hovering over another
 main menu does not work when a main menu drop down is already displayed.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/menu/menu-entry.reel/menu-entry.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js')

diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index ae3469c6..b765471b 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -107,6 +107,9 @@ exports.MenuEntry = Montage.create(Component, {
 
             this.element.addEventListener("mousedown", this, true);
 
+            this.topHeader.addEventListener("mouseover", this, false);//Todo: check why this listener as not getting added menuIsActive
+
+            //Todo: check this binding
             Object.defineBinding(this, "menuIsActive", {
                 boundObject: this._menu,
                 boundObjectPropertyPath: "active",
-- 
cgit v1.2.3


From ddeb291801a49b90062510d4e05f8531216cdff9 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 19 Jun 2012 11:30:15 -0700
Subject: IKNINJA 1754 menu not opening on hover

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/menu/menu-entry.reel/menu-entry.js | 26 ++++++------------------
 js/components/menu/menu-item.reel/menu-item.js   |  9 +++-----
 js/components/menu/menu.reel/menu.html           |  3 ++-
 3 files changed, 11 insertions(+), 27 deletions(-)

(limited to 'js')

diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b9c546ed..4fea0fe9 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component;
 
 exports.MenuEntry = Montage.create(Component, {
     topHeader: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     topHeaderText: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     subEntries: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     // Reference to the parent Menu component
@@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(value !== this._menu) {
                 this._menu = value;
             }
-        },
-        serializable: true
+        }
     },
 
     _data: {
@@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, {
             if(this._data !== value) {
                 this._data = value;
             }
-        },
-        serializable: true
+        }
     },
 
     select: {
@@ -79,7 +74,7 @@ exports.MenuEntry = Montage.create(Component, {
             return this._menuIsActive;
         },
         set: function(value) {
-            if(value)  this.topHeader.addEventListener("mouseover", this, false);
+            if(value)  this.element.addEventListener("mouseover", this, false);
         }
     },
 
@@ -87,14 +82,12 @@ exports.MenuEntry = Montage.create(Component, {
         value: function(event) {
             // TODO: Hack! Rework this!
             this.parentComponent.ownerComponent.toggleActivation(this);
-//            this._menu.toggleActivation(this);
         }
     },
 
     handleMouseover: {
         value: function(event) {
             this.parentComponent.ownerComponent.activeEntry = this;
-//            this._menu.activeEntry = this;
         }
     },
 
@@ -106,13 +99,6 @@ exports.MenuEntry = Montage.create(Component, {
             this.topHeaderText.innerHTML = this.data.header;
 
             this.element.addEventListener("click", this, false);
-
-            Object.defineBinding(this, "menuIsActive", {
-                boundObject: this._menu,
-                boundObjectPropertyPath: "active",
-                oneway: true
-            });
-
         }
     }
 });
\ No newline at end of file
diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index f9a625a3..3a5bf4ab 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -10,18 +10,15 @@ var Component = require("montage/ui/component").Component;
 exports.MenuItem = Montage.create(Component, {
 
     itemBackground: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     itemText: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     subMenu: {
-        value: null,
-        serializable: true
+        value: null
     },
 
     data: {
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
index f18c1a0f..98ffa92c 100755
--- a/js/components/menu/menu.reel/menu.html
+++ b/js/components/menu/menu.reel/menu.html
@@ -44,7 +44,8 @@
                     "element": { "#": "menuItem" }
                 },
                 "bindings": {
-                    "data": {"<-": "@repetition.objectAtCurrentIteration"}
+                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
+                    "menuIsActive": {"<-": "@owner.active"}
                 }
             },
             
-- 
cgit v1.2.3


From fb553a8054162b2aa0848d86b11d4e27002bffa9 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 19 Jun 2012 13:50:10 -0700
Subject: Reverting last change since this is is being made in a different pull
 request.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/components/menu/menu-entry.reel/menu-entry.js | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'js')

diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js
index b765471b..ae3469c6 100755
--- a/js/components/menu/menu-entry.reel/menu-entry.js
+++ b/js/components/menu/menu-entry.reel/menu-entry.js
@@ -107,9 +107,6 @@ exports.MenuEntry = Montage.create(Component, {
 
             this.element.addEventListener("mousedown", this, true);
 
-            this.topHeader.addEventListener("mouseover", this, false);//Todo: check why this listener as not getting added menuIsActive
-
-            //Todo: check this binding
             Object.defineBinding(this, "menuIsActive", {
                 boundObject: this._menu,
                 boundObjectPropertyPath: "active",
-- 
cgit v1.2.3


From aad41becbc41882abf1558c6b5aa38db6a9e99c8 Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Tue, 19 Jun 2012 15:06:45 -0700
Subject: Fixing logic to close color panel popup

This resolves closing the color panel popup when a user make a click outside the popup area or resizes the Ninja window. This should be tested prior to merging.
---
 js/panels/color/colorpopup-manager.js | 56 +++++++++++------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

(limited to 'js')

diff --git a/js/panels/color/colorpopup-manager.js b/js/panels/color/colorpopup-manager.js
index 529ec1c8..4667f2b4 100755
--- a/js/panels/color/colorpopup-manager.js
+++ b/js/panels/color/colorpopup-manager.js
@@ -29,49 +29,27 @@ exports.ColorPopupManager = Montage.create(Component, {
     	enumerable: false,
     	value: function () {
     		////////////////////////////////////////////////////////////
-            //TODO: Improve logic on handling closing the popup
-            ////////////////////////////////////////////////////////////
-            //Hiding popup on any panel(s) actions
-            this.eventManager.addEventListener("panelOrderChanged", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelClose", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelCollapsed", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelSelected", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("togglePanel", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizing", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizedStart", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
-            this.eventManager.addEventListener("panelResizedEnd", function (e) {
-                this.application.ninja.colorController.colorPopupManager.hideColorPopup();
-            }.bind(this));
-            //
+            //Closing popups on resize
             window.addEventListener('resize', function (e) {
                 this.application.ninja.colorController.colorPopupManager.hideColorPopup();
             }.bind(this));
-            //
+            //Storing limits of popup
+            var top, bottom, left, right; 
+            //Closing popups if outside limits
             document.addEventListener('mousedown', function (e) {
-                //
-                if (e._event.srcElement.getAttribute('data-montage-id') === 'stageCanvas' || e._event.srcElement.id === 'mainContainer' || e._event.srcElement.getAttribute('data-montage-id') === 'drawingCanvas') {
-                	this.application.ninja.colorController.colorPopupManager.hideColorPopup();
+                //Checking for popup to be opened otherwise nothing happens
+                if (this._popupPanel.opened && this._popupPanel.popup && this._popupPanel.popup.element && !e._event.srcElement.inputType) {
+                	//Getting horizontal limits	
+                	left = parseInt(this._popupPanel.popup.element.style.left) + parseInt(this._popupPanel.popup.element.style.marginLeft);
+                	right = left + parseInt(this._popupPanel.popup.element.offsetWidth);
+                	//Getting vertical limits
+                	top = parseInt(this._popupPanel.popup.element.style.top) + parseInt(this._popupPanel.popup.element.style.marginTop);
+                	bottom = left + parseInt(this._popupPanel.popup.element.offsetHeight);
+                	//Checking click position in relation to limits
+                	if ((e._event.clientX < left || e._event.clientX > right) || (e._event.clientY < top || e._event.clientY > bottom)) {
+                		//Hides popups since click is outside limits
+	                	this.application.ninja.colorController.colorPopupManager.hideColorPopup();
+                	}
                 }
             }.bind(this));
             ////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From a0d18963d746e410511c29edd32bc1775d2d5851 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 19 Jun 2012 15:42:31 -0700
Subject: IKNINJA-1519 - Transform tool does not transform objects correctly in
 3D space or in Top/Side view.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/tools/SelectionTool.js      |  7 ++-----
 js/tools/ToolBase.js           |  2 ++
 js/tools/drawing-tool-base.js  | 11 +++++++++--
 js/tools/modifier-tool-base.js | 17 ++++++++---------
 4 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'js')

diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 8b644d4a..9bd885a4 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -583,11 +583,8 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 this.mouseUpHitRec = DrawingToolBase.getUpdatedSnapPoint(point.x, point.y, do3DSnap, this.mouseDownHitRec);
                 if (this._mouseDownHitRec && this._mouseUpHitRec)
                 {
-                    data = this.getDrawingData(event);
-                    if(data)
-                    {
-                        this.modifyElements({pt0:data.mouseDownPos, pt1:data.mouseUpPos}, event);
-                    }
+                    this.modifyElements({pt0:this._mouseDownHitRec.calculateElementScreenPoint(),
+                                            pt1:this._mouseUpHitRec.calculateElementScreenPoint()}, event);
                 }
             }
         }
diff --git a/js/tools/ToolBase.js b/js/tools/ToolBase.js
index f43b1b58..88333c74 100755
--- a/js/tools/ToolBase.js
+++ b/js/tools/ToolBase.js
@@ -35,6 +35,8 @@ exports.toolBase = Montage.create(Component, {
     _currentX: {value: 0, writable: true},
     _currentY: {value: 0, writable: true},
 
+    _dragPlane: { value: null },
+
     /**
      * This function is for specifying custom feedback routine
      * upon mouse over.
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index a752ad65..b5416a65 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -14,9 +14,16 @@ var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
 
 exports.DrawingToolBase = Montage.create(Component, {
 
-    dragPlane: {
-        value: null
+   dragPlane:
+    {
+        get: function () {
+            return this.application.ninja.toolsData.selectedToolInstance._dragPlane;
+        },
+        set: function (value) {
+            this.application.ninja.toolsData.selectedToolInstance._dragPlane = value;
+        }
     },
+
     /**
      * Used on the initial MouseDown for Drawing Tools
      * 
diff --git a/js/tools/modifier-tool-base.js b/js/tools/modifier-tool-base.js
index 6c569f0a..14a7e619 100755
--- a/js/tools/modifier-tool-base.js
+++ b/js/tools/modifier-tool-base.js
@@ -21,7 +21,6 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
     //-------------------------------------------------------------------------
     // Snapping-specific properties
     _canSnap: { value: true },
-    _dragPlane: { value: null },
 	_snapParam: { value: null },
 	_snapIndex: { value: -1 },
 	_useQuadPt: { value: false },
@@ -163,15 +162,15 @@ exports.ModifierToolBase = Montage.create(DrawingTool, {
 
                     if(!this._dragPlane)
                     {
-//                        if( this._inLocalMode && (this._startMatArray.length === 1) )
-//                        {
-//                            this._dragPlane = viewUtils.getUnprojectedElementPlane(this._clickedObject);
-//                            snapManager.setupDragPlaneFromPlane(this._dragPlane);
-//                        }
-//                        else
-//                        {
+                        if((this._handleMode !== null) && (this.application.ninja.toolsData.selectedTool.action === "SelectionTool"))
+                        {
+                            this._dragPlane = viewUtils.getUnprojectedElementPlane(this.application.ninja.selectedElements[0]);
+                            snapManager.setupDragPlaneFromPlane(this._dragPlane);
+                        }
+                        else
+                        {
                             this._dragPlane = snapManager.setupDragPlanes( hitRec, true );
-//                        }
+                        }
                     }
 
                     // only do quadrant snapping if the 4 corners of the element are in the drag plane
-- 
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')

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 eb228e0489928f0464c295a024f0d45cf0a147c8 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 20 Jun 2012 11:24:13 -0700
Subject: remove unneeded files

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/controllers/elements/element-controller.js.orig |  393 --------
 js/document/_toDelete/html-document.js             |  873 ----------------
 js/mediators/element-mediator.js                   |  350 +++----
 js/panels/Timeline/Layer.reel/Layer.js.orig        | 1057 --------------------
 .../PropertyTrack.scssc                            |  Bin 5151 -> 0 bytes
 5 files changed, 175 insertions(+), 2498 deletions(-)
 delete mode 100755 js/controllers/elements/element-controller.js.orig
 delete mode 100755 js/document/_toDelete/html-document.js
 delete mode 100644 js/panels/Timeline/Layer.reel/Layer.js.orig
 delete mode 100644 js/panels/Timeline/PropertyTrack.reel/scss/.sass-cache/a26ed2cbe268f8c721d1b1d8dfa075c8c5b47e72/PropertyTrack.scssc

(limited to 'js')

diff --git a/js/controllers/elements/element-controller.js.orig b/js/controllers/elements/element-controller.js.orig
deleted file mode 100755
index bf631d61..00000000
--- a/js/controllers/elements/element-controller.js.orig
+++ /dev/null
@@ -1,393 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component,
-    njModule = require("js/lib/NJUtils");
-
-exports.ElementController = Montage.create(Component, {
-
-    addElement: {
-        value: function(el, styles) {
-        
-        	if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
-        	
-        	// Updated to use new methods in TimelinePanel. JR.
-        	var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
-        	if (insertionIndex === false) {
-        		this.application.ninja.currentSelectedContainer.appendChild(el);
-        	} else {
-	        	if (insertionIndex === 0) {
-	        		this.application.ninja.currentSelectedContainer.appendChild(el);
-	        	} else {
-                    var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
-                    element.parentNode.insertBefore(el, element.nextSibling);
-	        	}
-        	}
-        	
-            if(styles) {
-                this.application.ninja.stylesController.setElementStyles(el, styles);
-            }
-        	
-        	/*
-			// Old methods. Kept for reference. Delete if not needed. JR.
-            if(this.application.ninja.timeline.currentLayerSelected) {
-                var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
-
-                if(selectedLayerIndex === 0) {
-                    this.application.ninja.currentSelectedContainer.appendChild(el);
-                } else {
-                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.stageElement;
-                    element.parentNode.insertBefore(el, element.nextSibling);
-                }
-            } else {
-                this.application.ninja.currentSelectedContainer.appendChild(el);
-            }
-
-            if(styles) {
-                this.application.ninja.stylesController.setElementStyles(el, styles);
-            }
-            */
-        }
-    },
-
-    // Remove the element from the DOM and clear the GLWord.
-    removeElement: {
-        value: function(el) {
-            if(el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) {
-                el.elementModel.shapeModel.GLWorld.clearTree();
-            }
-            el.parentNode.removeChild(el);
-        }
-    },
-    
-    getProperty: {
-        value: function(el, prop, fallbackOnComputed, isStageElement) {
-            if(el.nodeType !== 3){
-                return this.application.ninja.stylesController.getElementStyle(el, prop, fallbackOnComputed, isStageElement);
-            }else{
-                return null;
-            }
-        }
-    },
-
-    setProperty: {
-        value: function(el, p, value) {
-            this.application.ninja.stylesController.setElementStyle(el, p, value);
-        }
-    },
-
-    setProperties: {
-        value: function(element, properties) {
-            for(var property in properties) {
-                this.application.ninja.stylesController.setElementStyle(element, property, properties[property]);
-        }
-        }
-    },
-
-    setAttribute: {
-        value: function(el, att, value) {
-            el.setAttribute(att, value);
-        }
-    },
-
-    //--------------------------------------------------------------------------------------------------------
-    // Routines to get/set color properties
-    // borderSide : "top", "right", "bottom", or "left"
-    getColor: {
-        value: function(el, isFill, borderSide) {
-            var colorObj, color, image;
-
-            // Return cached value if one exists
-            if(isFill) {
-//                if(el.elementModel.fill) {
-//                    return el.elementModel.fill;
-//                }
-                //TODO: Once logic for color and gradient is established, this needs to be revised
-                color = this.getProperty(el, "background-color");
-                image = this.getProperty(el, "background-image");
-            } else {
-                // Try getting border color from specific side first
-                if(borderSide) {
-                    color = this.getProperty(el, "border-" + borderSide + "-color",true);
-                    image = this.getProperty(el, "border-" + borderSide + "-image");
-                }
-
-                // If no color was found, look up the shared border color
-                if(!color && !image) {
-//                    if(el.elementModel.stroke) {
-//                        return el.elementModel.stroke;
-//                    }
-
-                    color = this.getProperty(el, "border-color");
-                    image = this.getProperty(el, "border-image");
-                }
-            }
-
-            if(color || image) {
-                if (image && image !== 'none' && image.indexOf('-webkit') >= 0) {
-                    //Gradient
-                    colorObj = this.application.ninja.colorController.getColorObjFromCss(image);
-                } else {
-                    //Solid
-                    colorObj = this.application.ninja.colorController.getColorObjFromCss(color);
-                }
-            }
-
-            // Update cache
-            if(isFill) {
-                el.elementModel.fill = colorObj;
-            } else if(!borderSide) {
-                // TODO - Need to update border style and width also
-                el.elementModel.stroke = colorObj;
-            } else {
-                // TODO - Should update specific border sides too
-            }
-
-            return colorObj;
-        }
-    },
-
-    setColor: {
-        value: function(el, color, isFill,borderSide) {
-            var mode = color.mode;
-
-            if(isFill) {
-                if(mode) {
-                    switch (mode) {
-                        case 'nocolor':
-                            this.setProperty(el, "background-image", "none");
-                            this.setProperty(el, "background-color", "none");
-                            el.elementModel.fill = null;
-                            return;
-                        case 'gradient':
-                            this.setProperty(el, "background-image", color.color.css);
-                            this.setProperty(el, "background-color", "none");
-                            break;
-                        default:
-                            this.setProperty(el, "background-image", "none");
-                            this.setProperty(el, "background-color", color.color.css);
-                    }
-                }
-
-                el.elementModel.fill = color;
-            } else {
-                if(mode) {
-                    switch (mode) {
-                        case 'nocolor':
-                            this.setProperty(el, "border-image", "none");
-                            this.setProperty(el, "border-color", "none");
-                            el.elementModel.stroke = null;
-                            return;
-                        case 'gradient':
-                            this.setGradientBorder(el, color.color.gradientMode, color.color.css);
-                            break;
-                        default:
-<<<<<<< HEAD
-                            if(borderSide){
-                                this.setProperty(el,"border-"+borderSide+"-color",color.color.css);
-                            }else{
-                                this.setProperty(el, "border-image", "none");
-                                this.setProperty(el, "border-color", color.color.css);
-                            }
-                            if(color.borderInfo) {
-                                if(color.borderInfo.borderWidth) {
-                                    this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits);
-                                }
-                                if(color.borderInfo.borderStyle) {
-                                    this.setProperty(el, "border-style", color.borderInfo.borderStyle);
-                                }
-                            }
-=======
-                            this.setProperty(el, "border-image", "none");
-                            this.setProperty(el, "border-image-slice", "");
-                            this.setProperty(el, "border-color", color.color.css);
->>>>>>> refs/heads/TimelineUberjd
-                    }
-                }
-                el.elementModel.stroke = color;
-            }
-        }
-    },
-
-    setGradientBorder: {
-        value: function(el, gradientMode, css) {
-            if(gradientMode === "radial") {
-                this.setProperty(el, "border-image", css.replace("ellipse", "circle"));
-            } else {
-                this.setProperty(el, "border-image", css);
-            }
-            this.setProperty(el, "border-color", "none");
-            // gradient slice = borderWidth/totalWidth
-            var b = parseInt(this.getProperty(el, "border-left-width", true)),
-                w = parseInt(this.getProperty(el, "width", true)),
-                h = parseInt(this.getProperty(el, "height", true));
-            if(h > w) {
-                w = h;
-            }
-            this.setProperty(el, "border-image-slice", Math.floor(b/(w+b+b) * 100) + "%");
-        }
-    },
-
-    getStroke: {
-        value: function(el, stroke) {
-            var strokeInfo = {},
-                color,
-                borderWidth,
-                border;
-            if(stroke.colorInfo) {
-                strokeInfo.colorInfo = {};
-                color = this.getColor(el, false);
-                if(color && color.color) {
-                    strokeInfo.colorInfo.mode = color.mode;
-                    strokeInfo.colorInfo.color = color.color;
-                } else {
-                    strokeInfo.colorInfo.mode = "nocolor";
-                    strokeInfo.colorInfo.color = null;
-                }
-            }
-            if(stroke.borderInfo) {
-                // TODO - Need to figure out which border side user wants
-                strokeInfo.borderInfo = {};
-                if(stroke.borderInfo.borderWidth) {
-                    borderWidth = this.getProperty(el, "border-width");
-                    if(borderWidth) {
-                        border = njModule.NJUtils.getValueAndUnits(borderWidth);
-                        strokeInfo.borderInfo.borderWidth = border[0];
-                        strokeInfo.borderInfo.borderUnits = border[1];
-                    }
-                }
-                if(stroke.borderInfo.borderStyle) {
-                    strokeInfo.borderInfo.borderStyle = this.getProperty(el, "border-style");
-                }
-            }
-            return strokeInfo;
-        }
-    },
-
-    setStroke: {
-        value: function(el, stroke) {
-            if(stroke.borderInfo) {
-                if(stroke.borderInfo.borderWidth) {
-                    this.application.ninja.stylesController.setElementStyle(el, "border-width", stroke.borderInfo.borderWidth + stroke.borderInfo.borderUnits);
-                }
-                if(stroke.borderInfo.borderStyle) {
-                    this.application.ninja.stylesController.setElementStyle(el, "border-style", stroke.borderInfo.borderStyle);
-                }
-            }
-            if(stroke.colorInfo) {
-                this.setColor(el, stroke.colorInfo, false);
-            }
-        }
-    },
-
-    getFill: {
-        value: function(el, fill) {
-            var fillInfo = {},
-                color;
-            if(fill.colorInfo) {
-                fillInfo.colorInfo = {};
-                color = this.getColor(el, true);
-                if(color && color.color) {
-                    fillInfo.colorInfo.mode = color.mode;
-                    fillInfo.colorInfo.color = color.color;
-                } else {
-                    fillInfo.colorInfo.mode = "nocolor";
-                    fillInfo.colorInfo.color = null;
-                }
-            }
-            return fillInfo;
-        }
-    },
-
-    setFill: {
-        value: function(el, fill) {
-            if(fill.colorInfo) {
-                this.setColor(el, fill.colorInfo, true);
-            }
-        }
-    },
-    //--------------------------------------------------------------------------------------------------------
-    // Routines to get/set 3D properties
-    get3DProperty: {
-        value: function(el, prop) {
-            if(el.elementModel.props3D) {
-                return el.elementModel.props3D[prop];
-            }
-        }
-    },
-
-    getMatrix: {
-        value: function(el) {
-            if(el.elementModel.props3D && el.elementModel.props3D.matrix3d) {
-                return el.elementModel.props3D.matrix3d.slice(0);
-            } else {
-                var mat;
-
-                if (el) {
-                    mat = this.application.ninja.stylesController.getMatrixFromElement(el, false);
-                    if (!mat) {
-                        mat = Matrix.I(4);
-                    }
-                }
-
-                el.elementModel.props3D.matrix3d = mat;
-                return mat;
-            }
-        }
-    },
-
-    getPerspectiveDist: {
-        value: function(el) {
-            if(el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
-                return el.elementModel.props3D.perspectiveDist;
-            } else {
-                var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false);
-                el.elementModel.props3D.perspectiveDist = dist;
-                return dist;
-            }
-        }
-    },
-
-    // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
-    set3DProperties: {
-        value: function(el, props, update3DModel) {
-            var dist = props["dist"],
-                mat = props["mat"];
-
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
-
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform-style", "preserve-3d");
-
-            // TODO - We don't support perspective on individual elements yet
-            // this.application.ninja.stylesController.setElementStyle(el, "-webkit-perspective", dist);
-
-            el.elementModel.props3D.matrix3d = mat;
-            el.elementModel.props3D.perspectiveDist = dist;
-
-            if(update3DModel) {
-                this._update3DProperties(el, mat, dist);
-            }
-        }
-    },
-
-    _update3DProperties: {
-        value: function(elt, mat, dist) {
-            var elt3DInfo = MathUtils.decomposeMatrix2(mat);
-            if(elt3DInfo)
-            {
-                elt.elementModel.props3D.xAngle = elt3DInfo.rotation[0] * MathUtils.RAD_TO_DEG;
-                elt.elementModel.props3D.yAngle = elt3DInfo.rotation[1] * MathUtils.RAD_TO_DEG;
-                elt.elementModel.props3D.zAngle = elt3DInfo.rotation[2] * MathUtils.RAD_TO_DEG;
-
-                elt.elementModel.props3D.x3D = ~~(elt3DInfo.translation[0]);
-                elt.elementModel.props3D.y3D = ~~(elt3DInfo.translation[1]);
-                elt.elementModel.props3D.z3D = ~~(elt3DInfo.translation[2]);
-            }
-        }
-    }
-
-});
\ No newline at end of file
diff --git a/js/document/_toDelete/html-document.js b/js/document/_toDelete/html-document.js
deleted file mode 100755
index 1bb643ac..00000000
--- a/js/document/_toDelete/html-document.js
+++ /dev/null
@@ -1,873 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-////////////////////////////////////////////////////////////////////////
-//
-var Montage = 		require("montage/core/core").Montage,
-    TextDocument =	require("js/document/text-document").TextDocument,
-    NJUtils = 		require("js/lib/NJUtils").NJUtils,
-	GLWorld =			require("js/lib/drawing/world").World,
-    MaterialsModel = require("js/models/materials-model").MaterialsModel;
-////////////////////////////////////////////////////////////////////////
-//
-exports.HTMLDocument = Montage.create(TextDocument, {
-    
-    _selectionExclude: { value: null, enumerable: false },
-    _htmlTemplateUrl: { value: "js/document/templates/montage-html/index.html", enumerable: false},
-    _iframe: { value: null, enumerable: false },
-    _server: { value: null, enumerable: false },
-    _templateDocument: { value: null, enumerable: false },
-    _selectionModel: { value: [], enumerable: false },
-    _undoModel: { value: { "queue" : [], "position" : 0 }, enumerable: false},
-
-    _document: { value: null, enumerable: false },
-    _documentRoot: { value: null, enumerable: false },
-    _liveNodeList: { value: null, enumarable: false },
-    _stageBG: { value: null, enumerable: false },
-    _window: { value: null, enumerable: false },
-    _styles: { value: null, enumerable: false },
-    _stylesheets: { value: null, enumerable: false },
-    _stageStyleSheetId : { value: 'nj-stage-stylesheet', enumerable: false },
-    _userDocument: { value: null, enumerable: false },
-    _htmlSource: {value: "<html></html>", enumerable: false},
-    _glData: {value: null, enumerable: false },
-    _userComponents: { value: {}, enumarable: false},
-
-    _elementCounter: { value: 1, enumerable: false },
-    _snapping : { value: true, enumerable: false },
-    _layoutMode: { value: "all", enumerable: false },
-    _draw3DGrid: { value: false, writable: true },
-    _swfObject: { value: false, enumerable: false },
-
-    _zoomFactor: { value: 100, enumerable: false },
-
-    cssLoadInterval: { value: null, enumerable: false },
-
-    _savedLeftScroll: {value:null},
-    _savedTopScroll: {value:null},
-
-    _codeViewDocument:{
-        writable: true,
-        enumerable: true,
-        value:null
-    },
-
-
-    //drawUtils state
-    _gridHorizontalSpacing: {value:0},
-    _gridVerticalSpacing: {value:0},
-    //end - drawUtils state
-
-    _undoStack: { value: [] },
-    undoStack: {
-        get: function() {
-            return this._undoStack;
-        },
-        set:function(value){
-            this._undoStack = value;
-        }
-    },
-
-    _redoStack: { value: [], enumerable: false },
-
-    redoStack: {
-        get: function() {
-            return this._redoStack;
-        },
-        set:function(value){
-            this._redoStack = value;
-        }
-    },
-
-    // GETTERS / SETTERS
-
-    codeViewDocument:{
-        get: function() { return this._codeViewDocument; },
-        set: function(value) { this._codeViewDocument = value}
-    },
-
-    savedLeftScroll:{
-        get: function() { return this._savedLeftScroll; },
-        set: function(value) { this._savedLeftScroll = value}
-    },
-
-    savedTopScroll:{
-        get: function() { return this._savedTopScroll; },
-        set: function(value) { this._savedTopScroll = value}
-    },
-
-    gridHorizontalSpacing:{
-        get: function() { return this._gridHorizontalSpacing; },
-        set: function(value) { this._gridHorizontalSpacing = value}
-    },
-
-    gridVerticalSpacing:{
-        get: function() { return this._gridVerticalSpacing; },
-        set: function(value) { this._gridVerticalSpacing = value}
-    },
-
-    selectionExclude: {
-        get: function() { return this._selectionExclude; },
-        set: function(value) { this._selectionExclude = value; }
-    },
-
-    iframe: {
-        get: function() { return this._iframe; },
-        set: function(value) { this._iframe = value; }
-    },
-
-    server: {
-        get: function() { return this._server; },
-        set: function(value) { this._server = value; }
-    },
-
-    selectionModel: {
-        get: function() { return this._selectionModel; },
-        set: function(value) { this._selectionModel = value; }
-    },
-
-    undoModel: {
-        get: function() { return this._undoModel; },
-        set: function(value) { this._undoModel.queue = value.queue; this._undoModel.position = value.position; }
-    },
-
-    documentRoot: {
-        get: function() { return this._documentRoot; },
-        set: function(value) { this._documentRoot = value; }
-    },
-
-    stageBG: {
-        get: function() { return this._stageBG; },
-        set: function(value) { this._stageBG = value; }
-    },
-
-    elementCounter: {
-        set: function(value) { this._elementCounter = value; },
-        get: function() { return this._elementCounter; }
-    },
-
-    snapping: {
-        get: function() { return this._snapping; },
-        set: function(value) {
-            if(this._snapping !== value) {
-                this._snapping = value;
-            }
-        }
-    },
-
-    // TODO SEND THE EVENT --> Redraw the desired layout
-    layoutMode: {
-        get: function() { return this._layoutMode; },
-        set: function(mode) { this._layoutMode = mode; }
-    },
-
-    draw3DGrid: {
-        get: function() { return this._draw3DGrid; },
-        set: function(value) {
-            if(this._draw3DGrid !== value) {
-                this._draw3DGrid = value;
-            }
-        }
-    },
-
-    userComponents: {
-        get: function() {
-            return this._userComponents;
-        }
-    },
-//    _drawUserComponentsOnOpen:{
-//        value:function(){
-//            for(var i in this._userComponentSet){
-//                console.log(this._userComponentSet[i].control)
-//                this._userComponentSet[i].control.needsDraw = true;
-//            }
-//        }
-//    },
-    
-    glData: {
-    	get: function() {
-			//
-			var elt = this.iframe.contentWindow.document.getElementById("UserContent");
-			//
-			if (elt) {
-                var matLib = MaterialsModel.exportMaterials();
-				this._glData = [matLib];
-				this.collectGLData(elt, this._glData );
-			} else {
-				this._glData = null
-			}
-			//	
-			return this._glData;
-		},
-        set: function(value) {
-			var elt = this.documentRoot;
-			if (elt)
-			{
-				/*
-				// Use this code to test the runtime version of WebGL
-				var cvsDataMngr = Object.create(NinjaCvsRt.CanvasDataManager, {});
-				cvsDataMngr.loadGLData(elt, value);
-				*/
-
-				// /*
-				var nWorlds= value.length;
-				for (var i=0;  i<nWorlds;  i++)
-				{
-					// get the data for the next canvas
-					var importStr = value[i];
-
-					// determine if it is the new (JSON) or old style format
-					var id = null;
-					var jObj = null;
-					var index = importStr.indexOf( ';' );
-					if ((importStr[0] === 'v') && (index < 24))
-					{
-						// JSON format.  pull off the
-						importStr = importStr.substr( index+1 );
-						jObj = JSON.parse( importStr );
-						id = jObj.id;
-					}
-					else
-					{
-                        // at this point the data could be either the materials library or
-                        // an old style world.  We can determine which by converting the string
-                        // to an object via JSON.parse.  That operation will fail if the string
-                        // is an old style world.
-                        var matLibStr = 'materialLibrary;';
-                        index = importStr.indexOf( matLibStr );
-                        if (index == 0)
-                        {
-                            importStr = importStr.substr( matLibStr.length );
-                            var matLibObj = JSON.parse( importStr );
-                            MaterialsModel.importMaterials( matLibObj );
-                        }
-                        else
-                        {
-						    var startIndex = importStr.indexOf( "id: " );
-						    if (startIndex >= 0) {
-							    var endIndex = importStr.indexOf( "\n", startIndex );
-							    if (endIndex > 0)
-								    id = importStr.substring( startIndex+4, endIndex );
-						    }
-                        }
-					}
-
-					if (id != null)
-					{
-						var canvas = this.findCanvasWithID( id, elt );
-						if (canvas)
-						{
-							if (!canvas.elementModel)
-							{
-								NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-							}
-							if (canvas.elementModel)
-							{
-								if (canvas.elementModel.shapeModel.GLWorld)
-									canvas.elementModel.shapeModel.GLWorld.clearTree();
-
-								if (jObj)
-								{
-									var useWebGL = jObj.webGL;
-									var world = new GLWorld( canvas, useWebGL );
-									world.importJSON( jObj );
-								}
-
-								this.buildShapeModel( canvas.elementModel, world );
-							}
-						}
-					}
-				}
-				// */
-			}
-		}
-    },
-
-	buildShapeModel:
-	{
-		value: function( elementModel, world )
-		{
-            var shapeModel = elementModel.shapeModel;
-			shapeModel.shapeCount	= 1;	// for now...
-			shapeModel.useWebGl		= world._useWebGL;
-			shapeModel.GLWorld		= world;
-			var root = world.getGeomRoot();
-			if (root)
-			{
-				shapeModel.GLGeomObj			= root;
-				shapeModel.strokeSize			= root._strokeWidth;
-