aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:17 -0800
committerJose Antonio Marquez2012-02-28 13:33:17 -0800
commitf7c08fe5a8424d8c7837a4e3a975e63bcddc3b14 (patch)
tree77a3d7edeefa60d9096b2b3368be11374f354b74 /js/io
parent811d5092345bf520f6a683eec89cf7d8ed7aa490 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-f7c08fe5a8424d8c7837a4e3a975e63bcddc3b14.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO-Build-Candidate
Diffstat (limited to 'js/io')
-rwxr-xr-xjs/io/system/coreioapi.js6
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js4
2 files changed, 5 insertions, 5 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 2051da43..f428a229 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -28,9 +28,9 @@ exports.CoreIoApi = Montage.create(Component, {
28 value: function () { 28 value: function () {
29 //////////////////////////////////////////////////////////// 29 ////////////////////////////////////////////////////////////
30 //Checking for local storage of URL for IO 30 //Checking for local storage of URL for IO
31 if (window.localStorage['ioRootUrl']) { 31 if (this.application.localStorage.getItem("ioRootUrl")) {
32 //Getting URL from local storage 32 //Getting URL from local storage
33 this.rootUrl = window.localStorage['ioRootUrl']; 33 this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
34 //Checks for IO API to be active 34 //Checks for IO API to be active
35 this.ioServiceDetected = this.cloudAvailable(); 35 this.ioServiceDetected = this.cloudAvailable();
36 } else { 36 } else {
@@ -156,7 +156,7 @@ exports.CoreIoApi = Montage.create(Component, {
156 return this._rootUrl; 156 return this._rootUrl;
157 }, 157 },
158 set: function(value) { 158 set: function(value) {
159 this._rootUrl = window.localStorage["ioRootUrl"] = value; 159 this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
160 } 160 }
161 }, 161 },
162 //////////////////////////////////////////////////////////////////// 162 ////////////////////////////////////////////////////////////////////
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index d2e82662..a4656bb5 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -63,8 +63,8 @@ exports.CloudPopup = Montage.create(Component, {
63 enumerable: false, 63 enumerable: false,
64 value: function() { 64 value: function() {
65 // 65 //
66 if (window.localStorage['ioRootUrl']) { 66 if (this.application.localStorage.getItem("ioRootUrl")) {
67 this.components.url.value = window.localStorage['ioRootUrl']; 67 this.components.url.value = this.application.localStorage.getItem("ioRootUrl");
68 } 68 }
69 // 69 //
70 this.testConnection(); 70 this.testConnection();