Merge branch 'refs/heads/ninja-internal' into WebGLFixes

1 files changed, 12 insertions, 13 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-workflow-controller.js b/js/io/ui/new-file-dialog/new-file-workflow-controller.js
index 901b61c7..279a74b4 100755
--- a/js/io/ui/new-file-dialog/new-file-workflow-controller.js
+++ b/js/io/ui/new-file-dialog/new-file-workflow-controller.js
@@ -27,6 +27,16 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
         value: null
     },
 
+    newFileOptionsNav:{
+        enumerable:true,
+        value: null
+    },
+
+    saveAsDialog:{
+        enumerable:true,
+        value: null
+    },
+
     showNewFileDialog:{
         writable:false,
         enumerable:true,
@@ -49,7 +59,7 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
                 this.model.defaultProjectType = lastSelectedProjectType;
             }
 
-            var newFileOptionsNav = newFileOptionsNavigatorModule.NewFileOptionsNavigator.create();
+            var newFileOptionsNav = this.newFileOptionsNav = newFileOptionsNavigatorModule.NewFileOptionsNavigator.create();
             newFileOptionsNav.newFileModel = this.model;
 
             var popup = Popup.create();
@@ -70,21 +80,10 @@ var NewFileWorkflowController =  exports.NewFileWorkflowController = Montage.cre
             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();
+            var saveAsDialog = this.saveAsDialog = saveAsModule.SaveAsDialog.create();
             saveAsDialog.fileName = fileName;
             saveAsDialog.folderUri = folderUri;
             saveAsDialog.callback = data.callback;
-            saveAsDialog.element = saveAsDialogContainer;
-
-            //remove after rendering and add in modal dialog
-            document.getElementById('modalContainer').removeChild(saveAsDialogContainer);
 
             var popup = Popup.create();
             popup.content = saveAsDialog;