Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 7 insertions, 7 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 a888d304..a8fec1e4 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
@@ -142,8 +142,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     },
 
     didDraw: {
-        enumerable: false,
-        value: function() {
+        enumerable: false,
+        value: function() {
             var that = this;
 
             this.templateList = null;
@@ -309,7 +309,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     handleOkButtonAction:{
         value: function(evt){
             var templateData,
-                selectedProjectTypeID = this.selectedProjectType.uri,
+                selectedProjectTypeID = this.selectedProjectType.uri,
                 templateID = this.selectedTemplate.uri,
                 projectName = this.newFileLocation.newFileName.value,
                 projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
@@ -324,10 +324,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                             "projectDirectory="+projectDirectory+"\n"+
                             "projectWidth="+projectWidth+"\n"+
                             "projectHeight="+projectHeight;
-                ////////////////////////////////////////////////////////////////////           
-                //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
-                templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
-                ////////////////////////////////////////////////////////////////////
+            ////////////////////////////////////////////////////////////////////
+            //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
+            templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
+            ////////////////////////////////////////////////////////////////////
 
             if(/[^/\\]$/g.test(projectDirectory)){
                 projectDirectory = projectDirectory + "/";