|
@@ -100,7 +100,7 @@ App.ModalPopup = Ember.View.extend({
|
|
|
|
|
|
enterKeyPressed: function (event) {
|
|
|
var primaryButton = this.$().find('.modal-footer > .btn-success').last();
|
|
|
- if ((!$("*:focus").is("textarea")) && primaryButton.length > 0 && primaryButton.attr('disabled') !== 'disabled') {
|
|
|
+ if (!$("*:focus").is('textarea') && primaryButton.length > 0 && primaryButton.attr('disabled') !== 'disabled') {
|
|
|
event.preventDefault();
|
|
|
event.stopPropagation();
|
|
|
primaryButton.click();
|
|
@@ -142,7 +142,9 @@ App.ModalPopup = Ember.View.extend({
|
|
|
'marginTop': 0
|
|
|
});
|
|
|
|
|
|
- block.css('max-height', $(window).height() - top * 2 - (popup.height() - block.height()));
|
|
|
+ var newMaxHeight = $(window).height() - top * 2 - (popup.height() - block.height());
|
|
|
+ newMaxHeight = Math.max(newMaxHeight, 500);
|
|
|
+ block.css('max-height', newMaxHeight);
|
|
|
}
|
|
|
});
|
|
|
|