Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into binding

47 files changed, 1079 insertions, 589 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/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index cf3dbbf5..304c8871 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -26,26 +26,10 @@
                     "element": {"#": "document"}
                 },
                 "bindings": {
-                    "document": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    },
-                    "name": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name",
-                        "oneway": true
-                    },
-                    "saveFlag": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave",
-                        "oneway": true
-                    },
-                    "active": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive",
-                        "oneway": true
-                    }
+                    "document": {"<-": "@repetition1.objectAtCurrentIteration"},
+                    "name":     {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
+                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
+                    "active":   {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
                 }
             },
             
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 2be2e214..48ceb21b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -88,18 +88,21 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                         
                         
                         
-
-////////////////////////////////////////////////////////////////////
+        //TODO: Ensure these APIs are not needed
+        ////////////////////////////////////////////////////////////////////
         //
     handleWebRequest: {
         value: function (request) {
                 //TODO: Check if frameId is proper
                 if (this._hackRootFlag && request.parentFrameId !== -1) {
-                        //TODO: Optimize creating string
-                        //console.log(request);
-                        //console.log(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1], request.url);
+                        //Checking for proper URL redirect (from different directories)
+                        if (request.url.indexOf('js/document/templates/banner') !== -1) {
+                                        return {redirectUrl: this.application.ninj