Merge branch 'refs/heads/Ninja-Internal' into Document

1 files changed, 59 insertions, 21 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index aaf39005..18556bc5 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -98,14 +98,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             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.eventManager.addEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
-            this.eventManager.addEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
-
-            this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
-            this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
-
             if(!!this.newFileModel.defaultProjectType){
                 var templates = this.newFileModel.prepareContents(this.newFileModel.defaultProjectType);
                 this.templateList = iconsListModule.IconsList.create();
@@ -116,7 +108,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 this.templateList.element = this.templateIcons;
                 this.templateList.needsDraw = true;
 
-
                 this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null};
             }
 
@@ -127,6 +118,33 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                     fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension;
                 }
             }
+
+            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.eventManager.addEventListener("newFileDirectorySet", function(evt){
+                that.handleNewFileDirectorySet(evt);
+            }, false);
+            this.eventManager.addEventListener("newFileNameSet", function(evt){
+                that.handleNewFileNameSet(evt);
+            }, false);
+
+            this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
+            this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
+
+            this.element.addEventListener("keyup", function(evt){
+                if(evt.keyCode == 27) {//ESC key
+                    if(that.application.ninja.newFileController.newFileOptionsNav !== null){
+                        that.handleCancelButtonAction();
+                    }
+                }else if((evt.keyCode == 13) && !(evt.ctrlKey || evt.metaKey)){//ENTER key
+                    if((that.application.ninja.newFileController.newFileOptionsNav !== null)
+                        && !that.okButton.hasAttribute("disabled")){
+
+                        that.handleOkButtonAction();
+                    }
+                }
+            }, true);
+
         }
 
     },
@@ -291,10 +309,16 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             }else{
                 if(this.error.innerHTML === ""){
                     this.showError("! Project Template, Name and Directory should be valid.");
-                }
-                //disable ok
-                if(!this.okButton.hasAttribute("disabled")){
-                    this.okButton.setAttribute("disabled", "true");
+                    //disable ok
+                    if(!this.okButton.hasAttribute("disabled")){
+                        this.okButton.setAttribute("disabled", "true");
+                    }
+                }else if(!this.selectedProjectType || !this.selectedTemplate){
+                    this.showError("! Project Template should be selected.");
+                    //disable ok
+                    if(!this.okButton.hasAttribute("disabled")){
+                        this.okButton.setAttribute("disabled", "true");
+                    }
                 }
             }
         }
@@ -302,7 +326,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleNewFileDirectorySet:{
         value:function(evt){
-            if(!!evt._event.newFileDirectory){
+            if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
+                this.handleOkButtonAction(evt);
+            }else if(evt.keyCode === 27){
+                this.handleCancelButtonAction(evt);
+            }
+            else if(!!evt._event.newFileDirectory){
                 this.newFileDirectory = evt._event.newFileDirectory;
                 if(this.isValidUri(this.newFileDirectory)){
                     this.enableOk();
@@ -313,7 +342,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleNewFileNameSet:{
         value:function(evt){
-            if(!!evt._event.newFileName){
+            if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
+                this.handleOkButtonAction(evt);
+            }else if(evt.keyCode === 27){
+                this.handleCancelButtonAction(evt);
+            }
+            else if(!!evt._event.newFileName){
                 this.newFileName = evt._event.newFileName;
                 if(this.isValidFileName(this.newFileName)){
                     this.enableOk();
@@ -374,14 +408,14 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             this.newFileName = "";
             this.newFileDirectory = "";
-            this.selectedProjectType = null;
-            this.selectedTemplate = null;
 
             //remove event listeners
             this.element.removeEventListener("drawTree", function(evt){that.handleNewFileNavDrawTree(evt);}, false);
             this.element.removeEventListener("selectedItem", function(evt){that.handleNewFileNavSelectedItem(evt);}, false);//for single selection only
             this.eventManager.removeEventListener("newFileDirectorySet", function(evt){that.handleNewFileDirectorySet(evt);}, false);
             this.eventManager.removeEventListener("newFileNameSet", function(evt){that.handleNewFileNameSet(evt);}, false);
+
+            this.application.ninja.newFileController.newFileOptionsNav = null;
         }
     },
 
@@ -391,6 +425,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             if(uri !== ""){
                 if(!status){
                     this.showError("! Invalid directory.");
+                    //disable ok
+                    if(!this.okButton.hasAttribute("disabled")){
+                        this.okButton.setAttribute("disabled", "true");
+                    }
                 }
             }
             return status;
@@ -402,6 +440,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             if(fileName !== ""){
                 if(!status){
                     this.showError("! Invalid file name.");
+                    //disable ok
+                    if(!this.okButton.hasAttribute("disabled")){
+                        this.okButton.setAttribute("disabled", "true");
+                    }
                 }
             }
             return status;
@@ -437,10 +479,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         value:function(errorString){