|
@@ -27,9 +27,10 @@ App.ApplicationView = Em.View.extend({
|
|
|
// on 'Esc' pressed, close the modal
|
|
|
$(document).keydown(function(event){
|
|
|
if (event.which == 13 || event.keyCode == 13 ) {
|
|
|
- var primaryButton = $(document).find('#modal > .modal-footer > .btn-success').first();
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var primaryButton = $(document).find('#modal > .modal-footer > .btn-success').last();
|
|
|
if (primaryButton.length > 0 && primaryButton.attr('disabled') != 'disabled') {
|
|
|
- event.preventDefault();
|
|
|
primaryButton.click();
|
|
|
return false;
|
|
|
}
|
|
@@ -38,9 +39,10 @@ App.ApplicationView = Em.View.extend({
|
|
|
});
|
|
|
$(document).keyup(function(event){
|
|
|
if (event.which == 27 || event.keyCode == 27) {
|
|
|
- var closeButton = $(document).find('#modal > .modal-header > .close').first();
|
|
|
+ event.preventDefault();
|
|
|
+ event.stopPropagation();
|
|
|
+ var closeButton = $(document).find('#modal > .modal-header > .close').last();
|
|
|
if (closeButton.length > 0) {
|
|
|
- event.preventDefault();
|
|
|
closeButton.click();
|
|
|
return false;
|
|
|
}
|