Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

4 files changed, 21 insertions, 10 deletions

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index fa4533d7..1ab0892d 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -34,7 +34,7 @@
                         
                         <h3>Cloud Service Dialog</h3>
                         
-                        <p>Duis aliquet egestas purus in blandit. Curabitur vulputate, ligula lacinia scelerisque tempor, lacus lacus ornare ante, ac egestas.</p>
+                        <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" />
                         
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index e8558179..7f494dcf 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -51,6 +51,9 @@ exports.CloudPopup = Montage.create(Component, {
         value: function() {
                 //
                 this.testConnection();
+                if (this.application.ninja.coreIoApi.cloudAvailable()) {
+                        this.closeDialog();
+                }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -62,7 +65,7 @@ exports.CloudPopup = Montage.create(Component, {
                 this.components.test_btn.addEventListener('click', this.testConnection.bind(this), false);
                 //
                 this.components.ok_btn.addEventListener('click', this.closeDialog.bind(this), false);
-                this.components.cancel_btn.addEventListener('click', this.closeDialog.bind(this), false);
+                this.components.cancel_btn.addEventListener('click', this.cancelDialog.bind(this), false);
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -90,6 +93,16 @@ exports.CloudPopup = Montage.create(Component, {
                 //
                 this.application.ninja.coreIoApi.hideCloudDialog();
         }
+    },
+    ////////////////////////////////////////////////////////////////////
+    //
+    cancelDialog: {
+        enumerable: false,
+        value: function() {
+                //
+                this.application.ninja.coreIoApi.rootUrl = null;
+                this.application.ninja.coreIoApi.hideCloudDialog();
+        }
     }
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
index eac18083..6d804e50 100644
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
@@ -36,11 +36,10 @@
 .cloud_popup .content p {
   text-shadow: 1px 1px 1px #222;
   margin: 0px 0px 12px 0px;
-  text-align: justify;
   color: #EEE;
 }
 
-/* line 48, cloudpopup.scss */
+/* line 47, cloudpopup.scss */
 .cloud_popup .content .btn_test {
   float: right;
   clear: right;
@@ -48,7 +47,7 @@
   width: 60px;
 }
 
-/* line 56, cloudpopup.scss */
+/* line 55, cloudpopup.scss */
 .cloud_popup .content label {
   float: left;
   margin: 5px 8px 0px 0px;
@@ -57,7 +56,7 @@
   text-align: right;
 }
 
-/* line 65, cloudpopup.scss */
+/* line 64, cloudpopup.scss */
 .cloud_popup .content input {
   display: block;
   float: left;
@@ -73,7 +72,7 @@
   background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(45%, #434343), color-stop(100%, #292929));
 }
 
-/* line 81, cloudpopup.scss */
+/* line 80, cloudpopup.scss */
 .cloud_popup .content input:focus {
   text-shadow: none;
   background: #FFF;
@@ -81,7 +80,7 @@
   color: #292929;
 }
 
-/* line 89, cloudpopup.scss */
+/* line 88, cloudpopup.scss */
 .cloud_popup .content .status {
   float: left;
   clear: right;
@@ -90,7 +89,7 @@
   width: 240px;
 }
 
-/* line 98, cloudpopup.scss */
+/* line 97, cloudpopup.scss */
 .cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel {
   width: 80px;
   text-align: center;
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
index 047e2dd1..5137beff 100755
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
@@ -40,7 +40,6 @@ $grey_light: #494949;
 {
         text-shadow: 1px 1px 1px #222;
         margin: 0px 0px 12px 0px;
-        text-align: justify;
         color: #EEE;
 }