check cloud availability before open file picker and new file dialogs

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

3 files changed, 32 insertions, 11 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index f8507086..e279d5c5 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -70,7 +70,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value: function (request) {
                 if (request.url.indexOf('js/document/templates/montage-html') !== -1) {
                         
-                        console.log(request);
+                        //console.log(request);
                         
                         //TODO: Figure out why active document is not available here
                         
@@ -98,18 +98,26 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleExecuteFileOpen: {
         value: function(event) {
             var pickerSettings = event._event.settings || {};
-            pickerSettings.callback = this.openFileWithURI.bind(this);
-            pickerSettings.pickerMode = "read";
-            pickerSettings.inFileMode = true;
-            this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            //adding callback so that file picker can be opened after checking cloud status
+            this.application.ninja.coreIoApi.cloudAvailable(function(){
+                pickerSettings.callback = this.openFileWithURI.bind(this);
+                pickerSettings.pickerMode = "read";
+                pickerSettings.inFileMode = true;
+                this.application.ninja.filePickerController.showFilePicker(pickerSettings);
+            }.bind(this));
+
         }
     },
 
     handleExecuteNewFile: {
             value: function(event) {
                 var newFileSettings = event._event.settings || {};
-                newFileSettings.callback = this.createNewFile.bind(this);
-                this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                //adding callback so that new file dialog can be opened after checking cloud status
+                this.application.ninja.coreIoApi.cloudAvailable(function(){
+                    newFileSettings.callback = this.createNewFile.bind(this);
+                    this.application.ninja.newFileController.showNewFileDialog(newFileSettings);
+                }.bind(this));
+
             }
     },
         
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 2051da43..1bc66532 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -234,18 +234,19 @@ exports.CoreIoApi = Montage.create(Component, {
     //Method to check status of I/O API, will return false if not active
         cloudAvailable: {
                 enumerable: false,
-                value: function () {
+                value: function (callback) {
                         var cloud = this.getCloudStatus();
                         //
                         if (this.rootUrl && cloud.status === 200) {
                                 //Active
                                 this.cloudData.name = cloud.response['name'];
                                 this.cloudData.root = cloud.response['server-root'];
-                                return true;
+                if(!!callback){callback();}
+                                else{return true};
                         } else {
                                 //Inactive
                                 if (!this._cloudDialogOpen && this.application.ninja) {
-                                        this.showCloudDialog();
+                                        this.showCloudDialog(callback);
                                 }
                                 return false;
                         }
@@ -273,7 +274,7 @@ exports.CoreIoApi = Montage.create(Component, {
     //
     showCloudDialog: {
         enumerable: false,
-                value: function () {
+                value: function (callback) {
                         //
                         this._cloudDialogOpen = true;
                         //
@@ -294,6 +295,7 @@ 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);
                 }
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index a2283d46..8e24f1a1 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -23,6 +23,12 @@ exports.CloudPopup = Montage.create(Component, {
     },
     ////////////////////////////////////////////////////////////////////
     //
+    callback:{
+        writable:true,
+        enumerable:true,
+        value:null
+    },
+    //
     components: {
         enumerable: false,
         value: {test_btn: null, ok_btn: null, cancel_btn: null, download_btn: null, status: null, url: null}
@@ -121,6 +127,10 @@ exports.CloudPopup = Montage.create(Component, {
         value: function() {
                 //
                 this.application.ninja.coreIoApi.hideCloudDialog();
+            this.application.ninja.coreIoApi._cloudDialogOpen=false;
+            if(!!this.callback){
+                this.callback();
+            }
         }
     },
     ////////////////////////////////////////////////////////////////////
@@ -131,6 +141,7 @@ exports.CloudPopup = Montage.create(Component, {
                 //
                 this.application.ninja.coreIoApi.rootUrl = null;
                 this.application.ninja.coreIoApi.hideCloudDialog();
+            this.application.ninja.coreIoApi._cloudDialogOpen=false;
         }
     }
     ////////////////////////////////////////////////////////////////////