Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

4 files changed, 127 insertions, 82 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..12af5988 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -4,12 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-/* /////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////
-NOTES:
-
-////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////// */
 //
 var Montage = require("montage/core/core").Montage;
 ////////////////////////////////////////////////////////////////////////
@@ -18,96 +13,80 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
         ////////////////////////////////////////////////////////////////////
     //
     _chromeApi: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     chromeApi: {
-        enumerable: false,
-        get: function() {
-            return this._chromeApi;
-        },
-        set: function(value) {
-                this._chromeApi = value;
-        }
+        get: function() {return this._chromeApi;},
+        set: function(value) {this._chromeApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _coreApi: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     coreApi: {
-        enumerable: false,
-        get: function() {
-            return this._coreApi;
-        },
-        set: function(value) {
-                this._coreApi = value;
-        }
+        get: function() {return this._coreApi;},
+        set: function(value) {this._coreApi = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _libs: {
-        enumerable: false,
         value: null
     },
     ////////////////////////////////////////////////////////////////////
     //
     libs: {
-        enumerable: false,
-        get: function() {
-            return this._libs;
-        },
-        set: function(value) {
-                this._libs = value;
-        }
+        get: function() {return this._libs;},
+        set: function(value) {this._libs = value;}
     },
     ////////////////////////////////////////////////////////////////////
     //
     _libsToSync: {
-        enumerable: false,
         value: 0
     },
     ////////////////////////////////////////////////////////////////////
     //
     _syncedLibs: {
-        enumerable: false,
         value: 0
     },
     ////////////////////////////////////////////////////////////////////
     //
     copyLibToCloud: {
-        enumerable: false,
         value: function (path, libName, callback) {
-                //
+                //Checking for library to exists
                 if(this.coreApi.directoryExists({uri: path+libName}).status === 404) {
+                        //Getting contents to begin copying
                         this.chromeApi.directoryContents(this.chromeApi.fileSystem.root, function (contents) {
                                 for (var i in contents) {
                                 if (libName === contents[i].name) {
                                                 //Getting contents of library to be copied