From 9f80fc891b7952900dabec04877606c6c8229c61 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Tue, 21 Feb 2012 09:47:05 -0800 Subject: 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 --- js/io/system/coreioapi.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'js/io/system') 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, { //Method to check status of I/O API, will return false if not active cloudAvailable: { enumerable: false, - value: function (callback) { + value: function () { var cloud = this.getCloudStatus(); // if (this.rootUrl && cloud.status === 200) { //Active this.cloudData.name = cloud.response['name']; this.cloudData.root = cloud.response['server-root']; - if(!!callback){callback();} - else{return true}; + return true; } else { //Inactive if (!this._cloudDialogOpen && this.application.ninja) { - this.showCloudDialog(callback); + this.showCloudDialog(); } return false; } @@ -274,7 +273,7 @@ exports.CoreIoApi = Montage.create(Component, { // showCloudDialog: { enumerable: false, - value: function (callback) { + value: function () { // this._cloudDialogOpen = true; // @@ -295,7 +294,6 @@ exports.CoreIoApi = Montage.create(Component, { this._cloudDialogComponents.dialog.element = popup; this._cloudDialogComponents.dialog.needsDraw = true; this._cloudDialogComponents.dialog.element.style.opacity = 0; - this._cloudDialogComponents.dialog.callback = callback; // this._cloudDialogComponents.dialog.addEventListener('firstDraw', this, false); } -- cgit v1.2.3