9 files changed, 122 insertions, 171 deletions

diff --git a/js/components/converter/string-units-converter.js b/js/components/converter/string-units-converter.js
new file mode 100644
index 00000000..6b97d5c5
--- /dev/null
+++ b/js/components/converter/string-units-converter.js
@@ -0,0 +1,31 @@
+/* <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").Montage,
+    Converter = require("montage/core/converter/converter").Converter,
+    NJUtils = require("js/lib/NJUtils").NJUtils;
+
+exports.StringUnitsConverter = Montage.create(Converter, {
+
+    // convert fahrenheit to celsius (showing our non-metric heritage here)
+    convert: {
+        value: function(value) {
+            if(value) {
+                console.log("convert string to unit ", value);
+                var tmp = NJUtils.getValueAndUnits(value);
+                return tmp[1];
+            }
+        }
+    },
+
+    // revert celsius to fahrenheit
+    revert: {
+        value: function(value) {
+            console.log("revert string to unit ", value);
+            return value;
+        }
+    }
+
+});
diff --git a/js/components/converter/string-value-converter.js b/js/components/converter/string-value-converter.js
new file mode 100644
index 00000000..28d7dd29
--- /dev/null
+++ b/js/components/converter/string-value-converter.js
@@ -0,0 +1,29 @@
+/* <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").Montage,
+    Converter = require("montage/core/converter/converter").Converter,
+    NJUtils = require("js/lib/NJUtils").NJUtils;
+
+exports.StringValueConverter = Montage.create(Converter, {
+
+    // convert fahrenheit to celsius (showing our non-metric heritage here)
+    convert: {
+        value: function(value) {
+            console.log(value);
+            console.log(parseInt(value));
+                return parseInt(value);
+        }
+    },
+
+    // revert celsius to fahrenheit
+    revert: {
+        value: function(value) {
+            console.log("revert string to value ", value);
+            return value;
+        }
+    }
+
+});
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 9e4110e2..81a63c90 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -7,8 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-//var documentManagerModule = ("js/document/documentManager");
-
 exports.DocumentEntry = Montage.create(Component, {
 
     dirty: { value: null },
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 48033b61..48ceb21b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -158,13 +158,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     },
 
     handleExecuteNewFile: {
-            value: function(event) {
-                var newFileSettings = event._event.settings || {};
-                if (this.application.ninja.coreIoApi.cloudAvailable()) {
-                    newFileSettings.callback = this.createNewFile.bind(this);
-                    this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
-                }
+        value: function(event) {
+            var newFileSettings = event._event.settings || {};
+            if (this.application.ninja.coreIoApi.cloudAvailable()) {
+                newFileSettings.callback = this.createNewFile.bind(this);
+                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
             }
+        }
     },
         ////////////////////////////////////////////////////////////////////
         //
@@ -610,7 +610,7 @@ if(this.activeDocument && this.application.ninja.coreIoApi.cloudAvailable()){
                     //hide the iframe when switching to code view
                     document.getElementById("iframeContainer").style.display = "none";
                 }
-        }
+            }
         }
     },
 
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index d1dc9f34..157cbc64 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, {
             {
                 label: "Style",
 
-                                Section: [
-                                    [
-
-                                    ]
-                                ]
-            }
-        ]
-    },
-
-    stagePi: {
-        value: [
-            {
-                label: "Style",
-
                 Section: [
                     [
                         {
-                            type : "chip",
-                            id : "background",
+                            type: "chip",
+                            id: "background",
                             prop: "background"
                         }
                     ]
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index d1cab096..94ca9b57 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -994,7 +994,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.arrLayers.splice(myIndex, 0, thingToPush);
 
             }
-            this.selectLayer(myIndex);
+            this.selectLayer(myIndex, false);
         }
     },
 
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 20f670d9..837e74bc 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -67,15 +67,11 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
-    // Document is opened - Display the current selection
     handleOpenDocument: {
         value: function() {
-
             this.eventManager.addEventListener( "elementChange", this, false);
 
-            // For now always assume that the stage is selected by default when opening the old template
-            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-           
+            // Display the default document root PI
             this.displayElementProperties(this.application.ninja.currentDocument.documentRoot);
         }
     },
@@ -156,7 +152,7 @@ exports.Properties = Montage.create(Component, {
                 this.positionSize.leftPosition = parseFloat(ElementsMediator.getProperty(el, "left"));
                 this.positionSize.topPosition = parseFloat(ElementsMediator.getProperty(el, "top"));
                 this.positionSize.heightSize = parseFloat(ElementsMediator.getProperty(el, "height"));
-                this.positionSize.widthSize = parseFloat(ElementsMediator.getProperty(el, "width"));
+                this.positionSize.widthSize = ElementsMediator.getProperty(el, "width");
 
                 if(this.threeD.inGlobalMode) {
                     this.threeD.x3D = ElementsMediator.get3DProperty(el, "x3D");
@@ -173,8 +169,6 @@ exports.Properties = Montage.create(Component, {
     handleSelectionChange: {
         value: function(event) {
             if(event.detail.isDocument) {
-//                if(this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() === "body") return;
-//                this.displayStageProperties();
                 this.displayElementProperties(this.application.ninja.currentDocument.documentRoot);
             } else {
                 if(this.application.ninja.selectedElements.length === 1) {
@@ -187,98 +181,23 @@ exports.Properties = Montage.create(Component, {
         }
     },
 
-    displayStageProperties: {