codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-23 13:26:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Better height estimation / observing for menu panels

Browse source
This commit is contained in:
Robin Ward 2015-09-16 14:46:35 -04:00
parent d61cfbe2aa
commit 63f0247d21
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/menu-panel.js.es6
View file

@ -43,7 +43,6 @@ export default Ember.Component.extend({
$panelBody.height(contentHeight); $panelBody.height(contentHeight);
$('body').addClass('drop-down-visible'); $('body').addClass('drop-down-visible');
} else { } else {
const menuTop = headerHeight(); const menuTop = headerHeight();
let height; let height;
@ -127,7 +126,7 @@ export default Ember.Component.extend({
_watchSizeChanges() { _watchSizeChanges() {
if (mutationSupport) { if (mutationSupport) {
this._observer.disconnect(); this._observer.disconnect();
this._observer.observe(this.element, { childList: true, subtree: true }); this._observer.observe(this.element, { childList: true, subtree: true, attributes: true });
} else { } else {
clearInterval(this._resizeInterval); clearInterval(this._resizeInterval);
this._resizeInterval = setInterval(() => { this._resizeInterval = setInterval(() => {

2
app/assets/javascripts/discourse/components/user-menu.js.es6
View file

@ -45,7 +45,7 @@ export default Ember.Component.extend({
if (this.get('loadingNotifications')) { return; } if (this.get('loadingNotifications')) { return; }
// estimate (poorly) the amount of notifications to return // estimate (poorly) the amount of notifications to return
var limit = Math.round(($(window).height() - headerHeight()) / 50); var limit = Math.round(($(window).height() - headerHeight()) / 55);
// we REALLY don't want to be asking for negative counts of notifications // we REALLY don't want to be asking for negative counts of notifications
// less than 5 is also not that useful // less than 5 is also not that useful
if (limit < 5) { limit = 5; } if (limit < 5) { limit = 5; }