Merge branch 'refs/heads/ninja-internal-master' into FileIO

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, {
                 value: function () {
                         ////////////////////////////////////////////////////////////
                         //Checking for local storage of URL for IO
-                        if (window.localStorage['ioRootUrl']) {
+            if (this.application.localStorage.getItem("ioRootUrl")) {
                                 //Getting URL from local storage
-                                this.rootUrl = window.localStorage['ioRootUrl'];
+                this.rootUrl = this.application.localStorage.getItem("ioRootUrl");
                                 //Checks for IO API to be active
                                 this.ioServiceDetected = this.cloudAvailable();
                         } else {
@@ -156,7 +156,7 @@ exports.CoreIoApi = Montage.create(Component, {
             return this._rootUrl;
         },
         set: function(value) {
-                this._rootUrl = window.localStorage["ioRootUrl"] = value;
+                this._rootUrl = this.application.localStorage.setItem("ioRootUrl", value);
         }
     },
         ////////////////////////////////////////////////////////////////////
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, {
         enumerable: false,
         value: function() {
                 //
-                if (window.localStorage['ioRootUrl']) {
-                        this.components.url.value = window.localStorage['ioRootUrl'];
+            if (this.application.localStorage.getItem("ioRootUrl")) {
+                this.components.url.value = this.application.localStorage.getItem("ioRootUrl");
                 }
                 //
                 this.testConnection();