Merge branch 'refs/heads/NinjaInternal' into Color

2 files changed, 5 insertions, 1 deletions

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();