diff options
| author | Eric Guzman | 2012-04-04 11:36:22 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-04 11:36:22 -0700 |
| commit | af52148777d554dc6e55a736574b82e4916f1fea (patch) | |
| tree | 39705d138b489d2e90722238c850320fd6b6a8e9 /js/io/ui/new-file-dialog/new-file-options-navigator.reel | |
| parent | b7ca1821ad43403a2a54361ffc6a0cdf9cba0e59 (diff) | |
| parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
| download | ninja-af52148777d554dc6e55a736574b82e4916f1fea.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPI
Conflicts:
js/controllers/presets-controller.js
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-options-navigator.reel')
| -rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 4 |
1 files changed, 2 insertions, 2 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 18556bc5..c98955ca 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 | |||
| @@ -326,8 +326,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
| 326 | 326 | ||
| 327 | handleNewFileDirectorySet:{ | 327 | handleNewFileDirectorySet:{ |
| 328 | value:function(evt){ | 328 | value:function(evt){ |
| 329 | if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){ | 329 | if(evt.keyCode === 13){ |
| 330 | this.handleOkButtonAction(evt); | 330 | if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt); |
| 331 | }else if(evt.keyCode === 27){ | 331 | }else if(evt.keyCode === 27){ |
| 332 | this.handleCancelButtonAction(evt); | 332 | this.handleCancelButtonAction(evt); |
| 333 | } | 333 | } |