Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	js/components/layout/tools-properties.reel/tools-properties.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

12 files changed, 119 insertions, 43 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index a06f45c6..1e6518fe 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -193,6 +193,23 @@ exports.CoreIoApi = Montage.create(Component, {
                 this._fileServiceURL = value;
         }
     },
+    ////////////////////////////////////////////////////////////////////
+    //File service API URL
+    _webServiceURL: {
+        enumerable: false,
+        value: '/web'
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    webServiceURL: {
+        enumerable: false,
+        get: function() {
+            return String(this.rootUrl+this._webServiceURL);
+        },
+        set: function(value) {
+                this._webServiceURL = value;
+        }
+    },
         ////////////////////////////////////////////////////////////////////
     //Directory service API URL
     _directoryServiceURL: {
@@ -647,6 +664,53 @@ exports.CoreIoApi = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
+    // Reads an external file (cross-domain)
+    // Parameters:
+    //      the file parameter must contain the following properties
+    //          url: string value containing the full file path/URL i.e. "http://google.com/motorola.html"
+    //          binary parameter is optional if the content is to be binary
+    // Return values:
+    //    returns an object with two properties
+    //      success: boolean indicating if the call succeeded or failed
+    //      content: string containing the file contents
+    //      status: int indicating the request HTTP status code
+    //              200 - the file was read and its contents were returned
+    //              404 - the file does not exist
+    //              500 - unknown server error occurred    
+    readExternalFile: {
+        enumerable: false,
+        value: function(file) {
+                //
+            var retValue = {success:null, content:null, status:null};
+            //
+            if(file && file.url && file.url.length) {
+                try {
+                        var serviceURL = this._prepareServiceURL(this.webServiceURL, ''),
+                                xhr = new XMLHttpRequest();
+                    //
+                    xhr.open("GET", serviceURL+"?url="+file.url, false);
+                    if (file.binary) xhr.setRequestHeader("return-type", "binary");
+                    xhr.setRequestHeader("Content-Type", "text/plain");
+                    xhr.send();
+                                        //
+                    if (xhr.readyState === 4) {
+                        retValue.status = xhr.status;
+                        if(xhr.status == 200) {
+                            retValue.content = xhr.response;
+                        }
+                        retValue.success = true;
+                    }
+                }
+                catch(error) {
+                    xhr = null;
+                    retValue.success = false;
+                }
+            }
+                        //
+            return retValue;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
     // Create a new directory/folder
     // Parameters:
     //      the dir parameter must contain the following properties
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js
index f78ad173..1680ca7f 100755
--- a/js/io/system/fileio.js
+++ b/js/io/system/fileio.js
@@ -146,7 +146,7 @@ exports.FileIo = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //
+    //TODO: Add functionality
     deleteFile: {
         enumerable: true,
         value: function() {
@@ -159,7 +159,7 @@ exports.FileIo = Montage.create(Component, {
         }
     },
     ////////////////////////////////////////////////////////////////////
-    //
+    //TODO: Add functionality
     copyFile: {
         enumerable: true,
         value: function() {
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 201598fc..78bdbe53 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -213,7 +213,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                         xhr.responseType = "arraybuffer"; 
                                         xhr.send();
                                         //Checking for status
-                                        if (xhr.readyState === 4) { //TODO: add check for mime type
+                                        if (xhr.readyState === 4) {
                                                 //Creating new file from loaded content
                                                 this.chromeApi.fileNew('/'+tocopylibs[i].name+'/'+tocopylibs[i].file, xhr.response, function (status) {if(status) this.libraryCopied()}.bind(this));
                                         } else {
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index acc03979..21c4b58c 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -6,7 +6,7 @@
                 "name":"Blank File",
                 "uri":"/",
                 "type":"directory",
-        "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt"]
+        "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"]
         },
         "js/io/templates/files/html.txt":{
                 "name":"HTML",
@@ -64,6 +64,13 @@
         "fileExtension":".rb",
         "children":["defaultTemplate"]
         },
+    "js/io/templates/files/xml.txt":{
+        "name":"XML",
+        "uri":"js/io/templates/files/xml.txt",
+        "type":"file",
+        "fileExtension":".xml",
+        "children":["defaultTemplate"]
+    },
     "defaultTemplate":{
         "name": "Basic",
         "uri": "defaultTemplate",
diff --git a/js/io/templates/files/html.txt b/js/io/templates/files/html.txt
index 15641348..4e42267e 100755
--- a/js/io/templates/files/html.txt
+++ b/js/io/templates/files/html.txt
@@ -9,6 +9,10 @@
                 <meta name="generator" content="Motorola Mobility Ninja">
                 
                 <style type="text/css">
+                    html, body {
+                width: 100%;
+                height: 100%;
+            }
                 </style>
                 
         </head>
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/xml.txt
new file mode 100644
index 00000000..8906a78b
--- /dev/null
+++ b/js/io/templates/files/xml.txt
@@ -0,0 +1 @@
+<!-- Created with Motorola Mobility Ninja -->
\ No newline at end of file
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index a75266a3..753597e7 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -28,7 +28,7 @@
         
         <body>
     
-        <div id="cloud_popup" class="cloud_popup">
+        <div data-montage-id="cloud_popup" class="cloud_popup">
                 <div class="content">
                         
                         <h3>Cloud Service Dialog</h3>
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 9113eb80..c3209654 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
@@ -30,9 +30,9 @@
     </script>
 </head>
 <body>
-<div id="fileInputField" class="fileInputField">
-    <input type="search" id="newFileDirectory" class="nj-skinned newFileDirectory" />
-    <span id="findDirectory" class="findDirectory"></span>
+<div data-montage-id="fileInputField" class="fileInputField">
+    <input type="search" data-montage-id="newFileDirectory" class="nj-skinned newFileDirectory" />
+    <span data-montage-id="findDirectory" class="findDirectory"></span>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
index 7100a738..34d6b53a 100755
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.html
@@ -38,41 +38,41 @@
 
 </head>
 <body>