Author: srimanth
Date: Tue Jan 29 00:01:54 2013
New Revision: 1439707
URL: http://svn.apache.org/viewvc?rev=1439707&view=rev
Log:
AMBARI-1275. Incorrect displaying "Background operations" window after changing
state of component. (srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1439707&r1=1439706&r2=1439707&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jan 29 00:01:54 2013
@@ -162,6 +162,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1275. Incorrect displaying "Background operations" window after
+ changing state of component. (srimanth)
+
AMBARI-1273. Edit User: No error message is shown when the user does not
enter the correct "old password". (srimanth)
Modified: incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js?rev=1439707&r1=1439706&r2=1439707&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js Tue Jan
29 00:01:54 2013
@@ -80,7 +80,7 @@ App.ModalPopup = Ember.View.extend({
if(this.autoHeight){
this._super();
var block = this.$().find('#modal > .modal-body').first();
- block.css('max-height', $(window).height()- block.offset().top - 300);
// fix popup height
+ block.css('max-height', $(window).height() - block.offset().top - 300 +
$(window).scrollTop()); // fix popup height
}
},
