diff options
author | Jonathan Duran | 2012-04-03 08:12:52 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-03 08:12:52 -0700 |
commit | 937271dc08894961e48a0e230d0bdcd17b01dc97 (patch) | |
tree | 50ddeacf252f91581bff725c6dc690e18fdaa723 /js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | |
parent | 7bcc6c6873778a19afb5b7f77e5b7e2e8deedd94 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-937271dc08894961e48a0e230d0bdcd17b01dc97.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 | 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 | } |