diff options
author | Ananya Sen | 2012-02-20 16:36:47 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-20 16:36:47 -0800 |
commit | 7dda611879e6232337d3f0540f8ae896c60fb898 (patch) | |
tree | 8c6643d6828e46b43281e854ce086de523144943 /js/io/ui | |
parent | 3251315ecc22544dab50623ee5862e00dfe02302 (diff) | |
parent | 205474042553704dd19b78ac0f909eb2acded2cd (diff) | |
download | ninja-7dda611879e6232337d3f0540f8ae896c60fb898.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/ui')
-rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.js | 4 |
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 8e24f1a1..34393db5 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js | |||
@@ -69,6 +69,10 @@ exports.CloudPopup = Montage.create(Component, { | |||
69 | enumerable: false, | 69 | enumerable: false, |
70 | value: function() { | 70 | value: function() { |
71 | // | 71 | // |
72 | if (window.localStorage['ioRootUrl']) { | ||
73 | this.components.url.value = window.localStorage['ioRootUrl']; | ||
74 | } | ||
75 | // | ||
72 | this.testConnection(); | 76 | this.testConnection(); |
73 | if (this.application.ninja.coreIoApi.cloudAvailable()) { | 77 | if (this.application.ninja.coreIoApi.cloudAvailable()) { |
74 | this.closeDialog(); | 78 | this.closeDialog(); |