aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-02-20 15:48:33 -0800
committerEric Guzman2012-02-20 15:48:33 -0800
commit98390588819b4871882fed2e0c9c627ec2d4a4af (patch)
tree518919b72235fd40883acd9929af66894cac6351 /js
parent27b1c2241a97472b4e3670080274767204955970 (diff)
parentbd7bc833895391e4974b8746f31f63ba70689df3 (diff)
downloadninja-98390588819b4871882fed2e0c9c627ec2d4a4af.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Diffstat (limited to 'js')
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js4
1 files changed, 4 insertions, 0 deletions
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, {
63 enumerable: false, 63 enumerable: false,
64 value: function() { 64 value: function() {
65 // 65 //
66 if (window.localStorage['ioRootUrl']) {
67 this.components.url.value = window.localStorage['ioRootUrl'];
68 }
69 //
66 this.testConnection(); 70 this.testConnection();
67 if (this.application.ninja.coreIoApi.cloudAvailable()) { 71 if (this.application.ninja.coreIoApi.cloudAvailable()) {
68 this.closeDialog(); 72 this.closeDialog();