7 files changed, 82 insertions, 127 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
index 7f11c225..092ca626 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.css
@@ -5,7 +5,7 @@
  </copyright> */
 
 .newfileLocation .newFileName{
-    width:70%;
+    width:65%;
     margin-left:5px;
 }
 
@@ -49,7 +49,7 @@
 }
 
 .newfileLocation .nameText{
-    margin-right:31px;
+    margin-right:28px;
 }
 
 .newfileLocation .hottextunit{
@@ -57,3 +57,6 @@
     display: inline;
 }
 
+.newfileLocation .fileExtension{
+    color:#d7d7d7;
+}
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index d7fbc235..8c0327eb 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -76,14 +76,18 @@
         <div class="template"></div>
     </div>
     <div class="locationSelection">
-        <div><span class="nameText">NAME:</span><input id="newFileName" class="nj-skinned newFileName" type="search" value="" /></div>
+        <div>
+            <span class="nameText">NAME:</span>
+            <input id="newFileName" class="nj-skinned newFileName" type="search" value="" />
+            <span class="fileExtension"></span>
+        </div>
         <div>
             <span>DIRECTORY:</span>
             <div id="fileInputField"></div>
         </div>
         <br />
-        <div><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div>
-        <div><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div>
+        <div style="display:none;"><span>WIDTH:</span><span class="templatePx" id="templateWidth"></span></div>
+        <div style="display:none;"><span>HEIGHT:</span><span class="templatePx" id="templateHeight"></span></div>
     </div>
 </div>
 </body>
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
index 7ef6d2ce..95ce01f9 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.css
@@ -153,4 +153,8 @@
     border:2px solid #a1a1a1;
     background-image:none;
     cursor:auto;
+}
+
+.newfile .atree ul{
+    -webkit-padding-start: 10px;
 }
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
index eb4a8045..c9178d65 100755
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html
@@ -70,7 +70,7 @@
 <div id="newfile" class="newfile">
     <div class="title">Create New File</div>
     <div class="container left-nav">
-        <div class="projectTypeHeader"><span>File Type</span></div>
+        <div class="projectTypeHeader"><span>Choose Type</span></div>
         <div id="projectTypeTree" class="projectTypeTree"></div>
     </div>
     <div class="container right-nav">
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 a747b8de..467c5452 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
@@ -92,6 +92,14 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
                 this.selectedProjectType = {"uri":this.newFileModel.defaultProjectType, "element":null};
             }
+
+            //update file Extension
+            if(!!this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension){
+                var fileExtensionEl = this.element.querySelector(".fileExtension");
+                if(!!fileExtensionEl){
+                    fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[this.newFileModel.defaultProjectType].fileExtension;
+                }
+            }
         }
 
     },
@@ -128,7 +136,15 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
                 //clear current template selection
                 if((!!this.selectedTemplate) && (this.selectedTemplate.element.classList.contains("selected"))){
-                                    this.selectedTemplate.element.classList.remove("selected");
+                    this.selectedTemplate.element.classList.remove("selected");
+                }
+
+                //update file Extension
+                if(!!this.newFileModel.projectTypeData[evt.uri].fileExtension){
+                    var fileExtensionEl = this.element.querySelector(".fileExtension");
+                    if(!!fileExtensionEl){
+                        fileExtensionEl.innerHTML = ""+this.newFileModel.projectTypeData[evt.uri].fileExtension;
+                    }
                 }
 
                 //disable ok
@@ -186,6 +202,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 projectWidth = this.newFileLocation.templateWidth,
                 projectHeight = this.newFileLocation.templateHeight,
 
+                newFilePath = "", fileExtension=this.newFileModel.projectTypeData[selectedProjectTypeID].fileExtension,
 
                 selectionlog= "selectedProjectTypeID="+selectedProjectTypeID +"\n"+
                             "templateID="+templateID+ "\n"+
@@ -194,29 +211,30 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                             "projectWidth="+projectWidth+"\n"+
                             "projectHeight="+projectHeight;
 
+
+            if(/[^/\\]$/g.test(projectDirectory)){
+                projectDirectory = projectDirectory + "/";
+            }
+            if(!!fileExtension && (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length))){
+                projectName = projectName+fileExtension;
+            }
+            newFilePath = "" + projectDirectory + projectName;
+
+
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
                 && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType)
             ){
                 this.error.innerHTML="";
-                console.log("$$$ new file selections: \n" + selectionlog);
+                //console.log("$$$ new file selections: \n" + selectionlog);
                 if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful
-                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"selectedProjectTypeID":selectedProjectTypeID,
-                                                                                 "templateID":templateID,
-                                                                                 "projectName": projectName,
-                                                                                 "projectDirectory":projectDirectory,
-                                                                                 "projectWidth":projectWidth,
-                                                                                 "projectHeight":projectHeight});//document-controller api
+                    this.newFileModel.callback.call(this.newFileModel.callbackScope, {"fileTemplateUri":selectedProjectTypeID,
+                                                                                 "newFilePath":newFilePath});//document-controller api
                 }else{
                     //send selection event