1 files changed, 312 insertions, 63 deletions

diff --git a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
index 86c2c86b..61b963b3 100644..100755
--- a/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/workflow/newFileDialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -8,8 +8,8 @@ var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
      iconsListModule = require("js/components/ui/icon-list-basic/iconsList.reel"),
     treeModule = require("js/components/ui/tree-basic/tree.reel"),
-    newFileLocationSelectionModule = require("js/io/workflow/newFileDialog/new-file-workflow-controller");
-    newFileWorkflowControllerModule = require("js/io/workflow/newFileDialog/new-file-location.reel");
+    newFileLocationSelectionModule = require("js/io/workflow/newFileDialog/new-file-workflow-controller"),
+    fileSystem = require("js/io/system/filesystem").FileSystem;
 
 var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(Component, {
 
@@ -23,10 +23,30 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         enumerable:false,
         value:null
     },
-    selectedTemplates:{
+    selectedTemplate:{
         writable: true,
         enumerable:false,
-        value:[]
+        value:null
+    },
+    newFileName:{
+        writable:true,
+        enumerable:false,
+        value:""
+    },
+    newFileDirectory:{
+        writable:true,
+        enumerable:false,
+        value:""
+    },
+    templateWidth:{
+        writable:true,
+        enumerable:false,
+        value:"0 px"
+    },
+    templateHeight:{
+        writable:true,
+        enumerable:false,
+        value:"0 px"
     },
     willDraw: {
         enumerable: false,
@@ -46,20 +66,32 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             //draw left nav project type tree
             var tree = treeModule.Tree.create();
             tree.showIcons = false;
+            tree.expandTreeAfterDraw = true;
             tree.directoryBold = true;
-            tree.treeViewDataObject = this.newFileModel.prepareContents("projectTypes");
+            tree.highlightedUri = this.newFileModel.defaultProjectType;
+            tree.treeViewDataObject = this.newFileModel.prepareContents("categories");
             tree.element = this.projectTypeTree;
             tree.needsDraw = true;
 
-            var newFileLocation = newFileWorkflowControllerModule.NewFileLocation.create();
-            newFileLocation.element = this.locationSelection;
-            newFileLocation.needsDraw = true;
+            //highlight defaultProjectType
 
             this.addIdentifiers();
 
             this.element.addEventListener("drawTree", function(evt){that.handleNewFileNavDrawTree(evt);}, false);
             this.element.addEventListener("selectedItem", function(evt){that.handleNewFileNavSelectedItem(evt);}, false);//for single selection only
-            this.cancelButton.addEventListener("click", this, false);
+            this.eventManager.addEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
+            this.eventManager.addEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
+
+            if(!!this.newFileModel.defaultProjectType){
+                var templates = this.newFileModel.prepareContents(this.newFileModel.defaultProjectType);
+                this.templateList = iconsListModule.IconsList.create();
+                this.templateList.iconsViewDataObject = templates;
+                this.templateList.element = this.templateIcons;
+                this.templateList.needsDraw = true;
+
+
+                this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null};
+            }
         }
 
     },
@@ -71,61 +103,72 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     addIdentifiers:{
         value: function(){
             this.element.identifier = "newFileNav";
-            this.okButton.identifier = "okButton";
-            this.cancelButton.identifier = "cancelButton";
         }
     },
 
     handleNewFileNavDrawTree:{
-            value: function(evt){
-                    //toggle open or close for directory
-                    if((evt.uriType === "directory") && (!!evt.subTreeContainer)){
-                        var tree = treeModule.Tree.create();
-                        tree.showIcons = false;
-                        tree.treeViewDataObject = this.newFileModel.prepareContents(evt.uri);
-                        tree.element = evt.subTreeContainer;
-                        tree.needsDraw = true;
-                    }
+        value: function(evt){
+                //toggle open or close for directory
+                if((evt.uriType === "directory") && (!!evt.subTreeContainer)){
+                    var tree = treeModule.Tree.create();
+                    tree.showIcons = false;
+                    tree.highlightedUri = this.newFileModel.defaultProjectType;
+                    tree.treeViewDataObject = this.newFileModel.prepareContents(evt.uri);
+                    tree.element = evt.subTreeContainer;
+                    tree.needsDraw = true;
                 }
-        },
+            }
+    },
 
     handleNewFileNavSelectedItem:{
         value: function(evt){
-                var selectionType =  this.newFileModel.projectTypeData[evt.uri].type;
-                if(evt.target.classList.contains("atreeItemContent") && (selectionType === "file")){//populate templates for project type selection
-                    //save project type selection
-                    this.selectedProjectType = evt.uri;
-
-                    //render templates
-                    var templates = this.newFileModel.prepareContents(evt.uri);
-                    if(this.templatesContainer.querySelectorAll(".list").length > 0){
-                        this.templateList.iconsViewDataObject = templates;
-                    }else{
-                        this.templateList = iconsListModule.IconsList.create();
-                        this.templateList.iconsViewDataObject = templates;
-                        this.templateList.element = this.templateIcons;
-                        this.templateList.needsDraw = true;
-                    }
+            var selectionType =  this.newFileModel.projectTypeData[evt.uri].type;
+            if(evt.target.classList.contains("atreeItemContent") && (selectionType === "file")){//populate templates for project type selection
+                this.highlightSelection(evt.target, "projectType", evt.uri);
+
+                //clear current template selection
+                if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){
+                                    this.selectedTemplate.element.classList.remove("selected");
                 }
 
-                if(evt.target.classList.contains("icon")){
-                    //save template selection
-                    this.selectedTemplates.push[evt.uri];//todo: check for duplicates
+                //disable ok
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+
+                //save project type selection
+                this.selectedProjectType = {"uri":evt.uri, "element":evt.target};
 
+                //render templates
+                var templates = this.newFileModel.prepareContents(evt.uri);
+                if(this.templatesContainer.querySelectorAll(".list").length > 0){
+                    this.templateList.iconsViewDataObject = templates;
+                }else{
+                    this.templateList = iconsListModule.IconsList.create();
+                    this.templateList.iconsViewDataObject = templates;
+                    this.templateList.element = this.templateIcons;