1 files changed, 15 insertions, 7 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));
+
             }
     },