Merge branch 'refs/heads/master' into nested-selection

4 files changed, 8 insertions, 3 deletions

diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 8c58883a..960bdef9 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -145,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;
                 //
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 05e0a427..a61c30d1 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,7 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
-                {"name": "Assets", "path": "/assets/descriptor.json", "version": "0.5.0.0"}, 
-                {"name": "RDGE", "path": "/js/helper-classes/RDGE/rdge-compiled.js", "version": "0.5.0.0", "file": "rdge-compiled.js"}
+                {"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 a2283d46..d2e82662 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -63,6 +63,10 @@ exports.CloudPopup = Montage.create(Component, {
         enumerable: false,
         value: function() {
                 //
+                if (window.localStorage['ioRootUrl']) {
+                        this.components.url.value = window.localStorage['ioRootUrl'];
+                }
+                //
                 this.testConnection();
                 if (this.application.ninja.coreIoApi.cloudAvailable()) {
                         this.closeDialog();