mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-17 23:44:39 -05:00
Merge pull request #4930 from jaswilli/issue-4871
Run listener callbacks in Ember run-loops
This commit is contained in:
commit
a30b165e13
1 changed files with 39 additions and 33 deletions
|
@ -1,37 +1,53 @@
|
||||||
import mobileQuery from 'ghost/utils/mobile';
|
import mobileQuery from 'ghost/utils/mobile';
|
||||||
import bind from 'ghost/utils/bind';
|
|
||||||
|
|
||||||
var ApplicationView = Ember.View.extend({
|
var ApplicationView = Ember.View.extend({
|
||||||
elementId: 'container',
|
elementId: 'container',
|
||||||
|
|
||||||
setupGlobalMobileNav: function () {
|
didInsertElement: function () {
|
||||||
// #### Navigating within the sidebar closes it.
|
// #### Navigating within the sidebar closes it.
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
$('body').on('click tap', '.js-nav-item', function () {
|
$('body').on('click tap', '.js-nav-item', function () {
|
||||||
if (mobileQuery.matches) {
|
Ember.run(function () {
|
||||||
self.set('controller.showGlobalMobileNav', false);
|
if (mobileQuery.matches) {
|
||||||
}
|
self.set('controller.showGlobalMobileNav', false);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// #### Close the nav if mobile and clicking outside of the nav or not the burger toggle
|
// #### Close the nav if mobile and clicking outside of the nav or not the burger toggle
|
||||||
$('.js-nav-cover').on('click tap', function () {
|
$('.js-nav-cover').on('click tap', function () {
|
||||||
var isOpen = self.get('controller.showGlobalMobileNav');
|
Ember.run(function () {
|
||||||
if (isOpen) {
|
var isOpen = self.get('controller.showGlobalMobileNav');
|
||||||
self.set('controller.showGlobalMobileNav', false);
|
|
||||||
}
|
if (isOpen) {
|
||||||
|
self.set('controller.showGlobalMobileNav', false);
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// #### Listen to the viewport and change user-menu dropdown triangle classes accordingly
|
function swapUserMenuDropdownTriangleClasses(mq) {
|
||||||
mobileQuery.addListener(this.swapUserMenuDropdownTriangleClasses);
|
if (mq.matches) {
|
||||||
this.swapUserMenuDropdownTriangleClasses(mobileQuery);
|
$('.js-user-menu-dropdown-menu').removeClass('dropdown-triangle-top-right ').addClass('dropdown-triangle-bottom');
|
||||||
}.on('didInsertElement'),
|
} else {
|
||||||
|
$('.js-user-menu-dropdown-menu').removeClass('dropdown-triangle-bottom').addClass('dropdown-triangle-top-right');
|
||||||
swapUserMenuDropdownTriangleClasses: function (mq) {
|
}
|
||||||
if (mq.matches) {
|
|
||||||
$('.js-user-menu-dropdown-menu').removeClass('dropdown-triangle-top-right ').addClass('dropdown-triangle-bottom');
|
|
||||||
} else {
|
|
||||||
$('.js-user-menu-dropdown-menu').removeClass('dropdown-triangle-bottom').addClass('dropdown-triangle-top-right');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #### Listen to the viewport and change user-menu dropdown triangle classes accordingly
|
||||||
|
this.set('swapUserMenuDropdownTriangleClasses', Ember.run.bind(this, swapUserMenuDropdownTriangleClasses));
|
||||||
|
|
||||||
|
mobileQuery.addListener(this.get('swapUserMenuDropdownTriangleClasses'));
|
||||||
|
swapUserMenuDropdownTriangleClasses(mobileQuery);
|
||||||
|
|
||||||
|
this.set('closeGlobalMobileNavOnDesktop', Ember.run.bind(this, function closeGlobalMobileNavOnDesktop(mq) {
|
||||||
|
if (!mq.matches) {
|
||||||
|
// Is desktop sized
|
||||||
|
this.set('controller.showGlobalMobileNav', false);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
mobileQuery.addListener(this.get('closeGlobalMobileNavOnDesktop'));
|
||||||
},
|
},
|
||||||
|
|
||||||
showGlobalMobileNavObserver: function () {
|
showGlobalMobileNavObserver: function () {
|
||||||
|
@ -42,20 +58,10 @@ var ApplicationView = Ember.View.extend({
|
||||||
}
|
}
|
||||||
}.observes('controller.showGlobalMobileNav'),
|
}.observes('controller.showGlobalMobileNav'),
|
||||||
|
|
||||||
setupCloseNavOnDesktop: function () {
|
willDestroyElement: function () {
|
||||||
this.set('closeGlobalMobileNavOnDesktop', bind(function closeGlobalMobileNavOnDesktop(mq) {
|
mobileQuery.removeListener(this.get('closeGlobalMobileNavOnDesktop'));
|
||||||
if (!mq.matches) {
|
mobileQuery.removeListener(this.get('swapUserMenuDropdownTriangleClasses'));
|
||||||
// Is desktop sized
|
},
|
||||||
this.set('controller.showGlobalMobileNav', false);
|
|
||||||
}
|
|
||||||
}, this));
|
|
||||||
|
|
||||||
mobileQuery.addListener(this.closeGlobalMobileNavOnDesktop);
|
|
||||||
}.on('didInsertElement'),
|
|
||||||
|
|
||||||
removeCloseNavOnDesktop: function () {
|
|
||||||
mobileQuery.removeListener(this.closeGlobalMobileNavOnDesktop);
|
|
||||||
}.on('willDestroyElement'),
|
|
||||||
|
|
||||||
toggleSettingsMenuBodyClass: function () {
|
toggleSettingsMenuBodyClass: function () {
|
||||||
$('body').toggleClass('settings-menu-expanded', this.get('controller.showSettingsMenu'));
|
$('body').toggleClass('settings-menu-expanded', this.get('controller.showSettingsMenu'));
|
||||||
|
|
Loading…
Add table
Reference in a new issue