diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js')
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 14 |
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 | |||
142 | }, | 142 | }, |
143 | 143 | ||
144 | didDraw: { | 144 | didDraw: { |
145 | enumerable: false, | 145 | enumerable: false, |
146 | value: function() { | 146 | value: function() { |
147 | var that = this; | 147 | var that = this; |
148 | 148 | ||
149 | this.templateList = null; | 149 | this.templateList = null; |
@@ -309,7 +309,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
309 | handleOkButtonAction:{ | 309 | handleOkButtonAction:{ |
310 | value: function(evt){ | 310 | value: function(evt){ |
311 | var templateData, | 311 | var templateData, |
312 | selectedProjectTypeID = this.selectedProjectType.uri, | 312 | selectedProjectTypeID = this.selectedProjectType.uri, |
313 | templateID = this.selectedTemplate.uri, | 313 | templateID = this.selectedTemplate.uri, |
314 | projectName = this.newFileLocation.newFileName.value, | 314 | projectName = this.newFileLocation.newFileName.value, |
315 | projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, | 315 | projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, |
@@ -324,10 +324,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
324 | "projectDirectory="+projectDirectory+"\n"+ | 324 | "projectDirectory="+projectDirectory+"\n"+ |
325 | "projectWidth="+projectWidth+"\n"+ | 325 | "projectWidth="+projectWidth+"\n"+ |
326 | "projectHeight="+projectHeight; | 326 | "projectHeight="+projectHeight; |
327 | //////////////////////////////////////////////////////////////////// | 327 | //////////////////////////////////////////////////////////////////// |
328 | //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…) | 328 | //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…) |
329 | templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type}; | 329 | templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type}; |
330 | //////////////////////////////////////////////////////////////////// | 330 | //////////////////////////////////////////////////////////////////// |
331 | 331 | ||
332 | if(/[^/\\]$/g.test(projectDirectory)){ | 332 | if(/[^/\\]$/g.test(projectDirectory)){ |
333 | projectDirectory = projectDirectory + "/"; | 333 | projectDirectory = projectDirectory + "/"; |