Repository: ambari Updated Branches: refs/heads/branch-2.2 0c4a180ed -> 2683e034a
AMBARI-14547. Ambari Web UI failures on branch-2.2 (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2683e034 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2683e034 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2683e034 Branch: refs/heads/branch-2.2 Commit: 2683e034aa0f7c87c7bf480bec4044b00e6be671 Parents: 0c4a180 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Jan 5 12:02:21 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Jan 5 12:02:21 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/views/common/modal_popup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2683e034/ambari-web/app/views/common/modal_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/modal_popup.js b/ambari-web/app/views/common/modal_popup.js index fbf539a..c98b6fd 100644 --- a/ambari-web/app/views/common/modal_popup.js +++ b/ambari-web/app/views/common/modal_popup.js @@ -65,10 +65,10 @@ App.ModalPopup = Ember.View.extend({ showCloseButton: true, didInsertElement: function () { - if (this.autoHeight) { + if (this.autoHeight && !$.mocho) { var block = this.$().find('#modal > .modal-body').first(); if(block.offset()) { - block.css('max-height', $(window).height() - block.offset().top - this.marginBottom + $(window).scrollTop()); // fix popup height + block.css('max-height', $(window).height() - block.offset().top - this.marginBottom + $(window).scrollTop()); // fix popup height } } this.fitZIndex();
