From aa454299894595c9fbf122ff1754221a13640148 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Sat, 29 Aug 2015 11:18:26 -0400 Subject: [PATCH] UX: Change heuristic for determining slide vs drop down --- .../javascripts/discourse/components/menu-panel.js.es6 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 85d89a4da42..5bcb736490a 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -49,7 +49,11 @@ export default Ember.Component.extend({ const force = this.get('force'); if (force) { return force; } - return ($(window).width() < 1024) ? 'slide-in' : 'drop-down'; + const headerWidth = $('#main-outlet .container').width() || 1100; + const screenWidth = $(window).width(); + const remaining = parseInt((screenWidth - headerWidth) / 2); + + return (remaining < 50) ? 'slide-in' : 'drop-down'; }, @observes('viewMode', 'visible') @@ -147,6 +151,8 @@ export default Ember.Component.extend({ Ember.run(() => this.performLayout()); }); } + + this.propertyDidChange('viewMode'); }, @on('willDestroyElement')