diff options
author | Ananya Sen | 2012-02-21 09:47:05 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-21 09:47:05 -0800 |
commit | 9f80fc891b7952900dabec04877606c6c8229c61 (patch) | |
tree | a23ecc6a0483d33875d44081cc3360c3fb74202e /js/io/system | |
parent | 7dda611879e6232337d3f0540f8ae896c60fb898 (diff) | |
download | ninja-9f80fc891b7952900dabec04877606c6c8229c61.tar.gz |
Revert "check cloud availability before open file picker and new file dialogs"
This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302.
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/system')
-rwxr-xr-x | js/io/system/coreioapi.js | 10 |
1 files changed, 4 insertions, 6 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 | } |