Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

5 files changed, 37 insertions, 24 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index b8aa8890..2051da43 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -40,6 +40,7 @@ exports.CoreIoApi = Montage.create(Component, {
                         ////////////////////////////////////////////////////////////
                         //Instance of ninja library
                         this.ninjaLibrary = NinjaLibrary;
+                        this.ninjaLibrary.coreApi = this;
                         //Getting reference of chrome file system API
                         this.chromeFileSystem = ChromeApi;
                         //Sending size in MBs for file system storage
@@ -62,6 +63,7 @@ exports.CoreIoApi = Montage.create(Component, {
                 this.chromeFileSystem.removeEventListener('ready', this, false);
                 //Listening for library to be copied event (builds list)
                 this.chromeFileSystem.addEventListener('library', this, false);
+                //TODO: Add sync loading screen logic (Add screen here)
         }
         },
         ////////////////////////////////////////////////////////////////////
@@ -86,23 +88,7 @@ exports.CoreIoApi = Montage.create(Component, {
                 console.log('Ninja Local Library: Ready');
                 //Removing events
                 this.ninjaLibrary.removeEventListener('sync', this, false);
-                this.ninjaLibrary.coreApi = this;
-                //TODO: Add sync loading screen logic
-                
-                //TODO: Remove test
-                //this.ninjaLibrary.copyLibToCloud('Users/kgq387/Desktop/Ninja Cloud/Disk', 'montage0.6.0');
-                //this.ninjaLibrary.deleteLibraries();
-                /*
-window.hack = function (name, type) {
-                        this.application.ninja.ioMediator.fileNew('Users/kgq387/Desktop/Ninja Cloud/Disk/'+name+'.'+type, '/js/io/templates/files/'+type+'.txt', function (status) {console.log(status)});
-                }.bind(this);
-*/                      
-                        /*
-window.hack = function (path) {
-                                //
-                                this.application.ninja.ioMediator.fileOpen('Users/kgq387/Desktop/Ninja Cloud/Disk/'+path, function (result) {console.log(result)});
-                        }.bind(this);
-*/
+                //TODO: Add sync loading screen logic (Remove screen here)
         }
     },
     ////////////////////////////////////////////////////////////////////
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index fc943323..960bdef9 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -51,6 +51,23 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    _libs: {
+        enumerable: false,
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    libs: {
+        enumerable: false,
+        get: function() {
+            return this._libs;
+        },
+        set: function(value) {
+                this._libs = value;
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
     _libsToSync: {
         enumerable: false,
         value: 0
@@ -67,14 +84,14 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
         enumerable: false,
         value: function (path, libName) {
                 //
-                if(this.coreApi.directoryExists({uri: '/'+path+'/'+libName+'/'}).status === 404) {
+                if(this.coreApi.directoryExists({uri: path+libName}).status === 404) {
                         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
                                                 this.chromeApi.directoryContents(contents[i], function (lib) {
                                                         //Creating directory structure from subfolders
-                                                        this.copyDirectoryToCloud(path, contents[i], '/'+path, function (status) {console.log(status)});
+                                                        this.copyDirectoryToCloud(path, contents[i], path, function (status) {console.log(status)});
                                                 }.bind(this));
                                                 break;
                                         }
@@ -99,7 +116,7 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                                 dir = folder.name;
                             }
                             //
-                            if (!this.coreApi.createDirectory({uri: '/'+dir+'/'})) {
+                            if (!this.coreApi.createDirectory({uri: dir})) {
                                 //Error occured while creating folders
                                 return;
                             }
@@ -128,6 +145,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
     synchronize: {
         enumerable: true,
         value: function(chromeLibs, chrome) {
+                //TODO: Remove
+                window.wipeLibrary = this.deleteLibraries.bind(this);
                 //
                 this.chromeApi = chrome;
                 //
@@ -140,6 +159,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
                 //Parsing json libraries
                 libs = JSON.parse(xhr.response);
                 //
+                this.libs = libs.libraries;
+                //
                 if (chromeLibs.length > 0) {
                         //
                         for (i=0; chromeLibs[i]; i++) {
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 272cc2c7..a61c30d1 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.6.0"}, 
-                {"name": "RDGE", "path": "/js/helper-classes/RDGE/rdge-compiled.js", "version": "0.6.0", "file": "rdge-compiled.js"}
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.0.1"}
         ]
 }
\ 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 2c1c169a..e58041ec 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -36,7 +36,7 @@
                         
                         <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p>
                         
-                        <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" />
+                        <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" />
                         
                         <button class="btn_test nj-skinned">Test</button>
                         
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index e5bad98e..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -88,7 +88,13 @@ exports.CloudPopup = Montage.create(Component, {
     downloadCloudApp: {
         enumerable: false,
         value: function() {
-                console.log(this._os);
+                if(this._os === 'mac') {
+                        location.href = '/ninja_localcloud_for_mac.zip';
+                } else if (this._os === 'windows') {
+                        location.href = '/ninja_localcloud_for_windows.zip';
+                } else {
+                        alert('Your operating system is not supported by the Ninja Local Cloud App.');
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////