diff options
Diffstat (limited to 'js/io')
-rwxr-xr-x | js/io/system/coreioapi.js | 10 | ||||
-rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.js | 11 |
2 files changed, 4 insertions, 17 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index 1bc66532..2051da43 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
@@ -234,19 +234,18 @@ exports.CoreIoApi = Montage.create(Component, { | |||
234 | //Method to check status of I/O API, will return false if not active | 234 | //Method to check status of I/O API, will return false if not active |
235 | cloudAvailable: { | 235 | cloudAvailable: { |
236 | enumerable: false, | 236 | enumerable: false, |
237 | value: function (callback) { | 237 | value: function () { |
238 | var cloud = this.getCloudStatus(); | 238 | var cloud = this.getCloudStatus(); |
239 | // | 239 | // |
240 | if (this.rootUrl && cloud.status === 200) { | 240 | if (this.rootUrl && cloud.status === 200) { |
241 | //Active | 241 | //Active |
242 | this.cloudData.name = cloud.response['name']; | 242 | this.cloudData.name = cloud.response['name']; |
243 | this.cloudData.root = cloud.response['server-root']; | 243 | this.cloudData.root = cloud.response['server-root']; |
244 | if(!!callback){callback();} | 244 | return true; |
245 | else{return true}; | ||
246 | } else { | 245 | } else { |
247 | //Inactive | 246 | //Inactive |
248 | if (!this._cloudDialogOpen && this.application.ninja) { | 247 | if (!this._cloudDialogOpen && this.application.ninja) { |
249 | this.showCloudDialog(callback); | 248 | this.showCloudDialog(); |
250 | } | 249 | } |
251 | return false; | 250 | return false; |
252 | } | 251 | } |
@@ -274,7 +273,7 @@ exports.CoreIoApi = Montage.create(Component, { | |||
274 | // | 273 | // |
275 | showCloudDialog: { | 274 | showCloudDialog: { |
276 | enumerable: false, | 275 | enumerable: false, |
277 | value: function (callback) { | 276 | value: function () { |
278 | // | 277 | // |
279 | this._cloudDialogOpen = true; | 278 | this._cloudDialogOpen = true; |
280 | // | 279 | // |
@@ -295,7 +294,6 @@ exports.CoreIoApi = Montage.create(Component, { | |||
295 | this._cloudDialogComponents.dialog.element = popup; | 294 | this._cloudDialogComponents.dialog.element = popup; |
296 | this._cloudDialogComponents.dialog.needsDraw = true; | 295 | this._cloudDialogComponents.dialog.needsDraw = true; |
297 | this._cloudDialogComponents.dialog.element.style.opacity = 0; | 296 | this._cloudDialogComponents.dialog.element.style.opacity = 0; |
298 | this._cloudDialogComponents.dialog.callback = callback; | ||
299 | // | 297 | // |
300 | this._cloudDialogComponents.dialog.addEventListener('firstDraw', this, false); | 298 | this._cloudDialogComponents.dialog.addEventListener('firstDraw', this, false); |
301 | } | 299 | } |
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js index 34393db5..d2e82662 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.js +++ b/js/io/ui/cloudpopup.reel/cloudpopup.js | |||
@@ -23,12 +23,6 @@ exports.CloudPopup = Montage.create(Component, { | |||
23 | }, | 23 | }, |
24 | //////////////////////////////////////////////////////////////////// | 24 | //////////////////////////////////////////////////////////////////// |
25 | // | 25 | // |
26 | callback:{ | ||
27 | writable:true, | ||
28 | enumerable:true, | ||
29 | value:null | ||
30 | }, | ||
31 | // | ||
32 | components: { | 26 | components: { |
33 | enumerable: false, | 27 | enumerable: false, |
34 | value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null} | 28 | value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null} |
@@ -131,10 +125,6 @@ exports.CloudPopup = Montage.create(Component, { | |||
131 | value: function() { | 125 | value: function() { |
132 | // | 126 | // |
133 | this.application.ninja.coreIoApi.hideCloudDialog(); | 127 | this.application.ninja.coreIoApi.hideCloudDialog(); |
134 | this.application.ninja.coreIoApi._cloudDialogOpen=false; | ||
135 | if(!!this.callback){ | ||
136 | this.callback(); | ||
137 | } | ||
138 | } | 128 | } |
139 | }, | 129 | }, |
140 | //////////////////////////////////////////////////////////////////// | 130 | //////////////////////////////////////////////////////////////////// |
@@ -145,7 +135,6 @@ exports.CloudPopup = Montage.create(Component, { | |||
145 | // | 135 | // |
146 | this.application.ninja.coreIoApi.rootUrl = null; | 136 | this.application.ninja.coreIoApi.rootUrl = null; |
147 | this.application.ninja.coreIoApi.hideCloudDialog(); | 137 | this.application.ninja.coreIoApi.hideCloudDialog(); |
148 | this.application.ninja.coreIoApi._cloudDialogOpen=false; | ||
149 | } | 138 | } |
150 | } | 139 | } |
151 | //////////////////////////////////////////////////////////////////// | 140 | //////////////////////////////////////////////////////////////////// |