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

Conflicts:
	js/document/templates/montage-html/default_html.css
	js/lib/NJUtils.js

12 files changed, 190 insertions, 14 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 f4915a91..3de5fb69 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -209,7 +209,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/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index feced079..041e7ed7 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.8.0.0"},
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.10.0.0"},
                 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.6.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index 21c4b58c..9c9c4ac8 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -1,13 +1,21 @@
 {
         "categories":{
-                "children":["/"]
+                "children":["/basic", "/template"]
         },
-        "/":{
+        
+        "/basic":{
                 "name":"Blank File",
-                "uri":"/",
+                "uri":"/basic",
                 "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", "js/io/templates/files/xml.txt"]
         },
+        "/template":{
+                "name":"Template",
+                "uri":"/template",
+                "type":"directory",
+        "children":["js/io/templates/files/banner.txt", "js/io/templates/files/animation.txt"]
+        },
+        
         "js/io/templates/files/html.txt":{
                 "name":"HTML",
                 "uri":"js/io/templates/files/html.txt",
@@ -75,6 +83,58 @@
         "name": "Basic",
         "uri": "defaultTemplate",
         "type":"file"
+    },
+    
+    "js/io/templates/files/banner.txt":{
+                "name":"Banner",
+                "uri":"js/io/templates/files/banner.txt",
+                "type":"file",
+        "fileExtension":".html",
+        "children":["120x600", "160x600", "200x200", "250x250", "300x250", "336x280"]
+        },
+    
+    "120x600":{
+        "name": "Skyscraper",
+        "uri": "120x600",
+        "type":"file"
+    },
+    "160x600":{
+        "name": "Wide Skyscraper",
+        "uri": "160x600",
+        "type":"file"
+    },
+    "200x200":{
+        "name": "Small Square",
+        "uri": "200x200",
+        "type":"file"
+    },
+    "250x250":{
+        "name": "Square",
+        "uri": "250x250",
+        "type":"file"
+    },
+    "300x250":{
+        "name": "Medium Rectangle",
+        "uri": "300x250",
+        "type":"file"
+    },
+    "336x280":{
+        "name": "Large Rectangle",
+        "uri": "336x280",
+        "type":"file"
+    },
+    
+    "js/io/templates/files/animation.txt":{
+                "name":"Animation",