1 files changed, 66 insertions, 9 deletions

diff --git a/js/io/workflow/newFileDialog/new-file-workflow-controller.js b/js/io/workflow/newFileDialog/new-file-workflow-controller.js
index 5cc68bf9..18c84724 100644..100755
--- a/js/io/workflow/newFileDialog/new-file-workflow-controller.js
+++ b/js/io/workflow/newFileDialog/new-file-workflow-controller.js
@@ -8,9 +8,10 @@ var Montage = require("montage/core/core").Montage,
     Popup = require("montage/ui/popup/popup.reel").Popup,
     newFileOptionsNavigatorModule = require("js/io/workflow/newFileDialog/new-file-options-navigator.reel"),
     newFileWorkflowModelModule = require("js/io/workflow/newFileDialog/new-file-workflow-model");
+    saveAsModule = require("js/io/workflow/save-as-dialog.reel");
 
 //singleton
-exports.NewFileWorkflowController = Montage.create(require("montage/ui/component").Component, {
+var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.create(require("montage/ui/component").Component, {
     /**
      * Register a listener for showPicker event
      */
@@ -20,40 +21,96 @@ exports.NewFileWorkflowController = Montage.create(require("montage/ui/component
         value:function(){
             var that = this;
             this.eventManager.addEventListener("executeNewFile", function(evt){
-                that.showNewFileDialog();
+                var data = evt._event.data || {};//data will contain callback
+                that.showNewFileDialog(data);
+            }, false);
+
+            this.eventManager.addEventListener("saveAs", function(evt){
+                var data = evt._event.data || {};//data will contain the current file name, directory location and callback
+                that.showSaveAsDialog(data);
             }, false);
         }
     },
 
+    model:{
+        writable: true,
+        enumerable:true,
+        value: newFileWorkflowModelModule.NewFileWorkflowModel
+    },
+
     showNewFileDialog:{
         writable:false,
         enumerable:true,
-        value:function(){
-            var aModel = null;
+        value:function(data){
+            //get default project type
+            this.model.defaultProjectType = "htmlTemplate";
+            this.model.callback = data.callback || null;
+            this.model.callbackScope = data.callbackScope || null;
+
+            //populate the last opened folder first, if none then populate default root
+            var sessionStorage = window.sessionStorage;
+            var lastSelectedProjectType = sessionStorage.getItem("lastSelectedProjectType");
+
+            if(!!lastSelectedProjectType){
+                this.model.defaultProjectType = lastSelectedProjectType;
+            }
+
             //render modal dialog
             var newFileNavContent = document.createElement("div");
             newFileNavContent.id = "newFileDialog";
-            newFileNavContent.style.width = "650px";
-            newFileNavContent.style.height = "350px";
-            newFileNavContent.style.color = "#fff";
 
             //elements needs to be on DOM to be drawn
             document.getElementById('modalContainer').appendChild(newFileNavContent);
 
             var newFileOptionsNav = newFileOptionsNavigatorModule.NewFileOptionsNavigator.create();
-            newFileOptionsNav.newFileModel = newFileWorkflowModelModule.NewFileWorkflowModel;
+            newFileOptionsNav.newFileModel = this.model;
             newFileOptionsNav.element = newFileNavContent;
 
-            //hack - remove after rendering and add in modal dialog
+            //remove after rendering and add in modal dialog
             document.getElementById('modalContainer').removeChild(newFileNavContent);
 
             var popup = Popup.create();
             popup.content = newFileOptionsNav;
             popup.modal = true;
+            popup.type = "newFileDialog";
             popup.show();
 
             newFileOptionsNav.popup = popup;//handle to be used for hiding the popup
 
         }
+    },
+
+    showSaveAsDialog:{
+        writable:false,
+        enumerable:true,
+        value:function(data){
+            var fileName = data.fileName || "filename.txt";
+            var folderUri = data.folderUri || "/Documents";
+
+            //render modal dialog
+            var saveAsDialogContainer = document.createElement("div");
+            saveAsDialogContainer.id = "saveAsDialog";
+
+            //elements needs to be on DOM to be drawn
+            document.getElementById('modalContainer').appendChild(saveAsDialogContainer);
+
+            var saveAsDialog = saveAsModule.SaveAsDialog.create();
+            saveAsDialog.fileName = fileName;
+            saveAsDialog.folderUri = folderUri;
+            saveAsDialog.callback = data.callback;
+            saveAsDialog.callbackScope = data.callbackScope;
+            saveAsDialog.element = saveAsDialogContainer;
+
+            //remove after rendering and add in modal dialog
+            document.getElementById('modalContainer').removeChild(saveAsDialogContainer);
+
+            var popup = Popup.create();
+            popup.content = saveAsDialog;
+            popup.modal = true;
+            popup.type = "saveAsDialog";
+            popup.show();
+
+            saveAsDialog.popup = popup;//handle to be used for hiding the popup
+        }
     }
 });
\ No newline at end of file