IntenseWebs/gantry5
3
0
Fork 0
mirror of https://github.com/gantry/gantry5.git synced 2026-08-19 01:15:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Debouncing the toggles check to fix some odd behaviors in Firefox (#100)

Browse Source
This commit is contained in:
Djamil Legato
2015-04-21 15:03:34 -07:00
parent 5b20c402ff
commit cb5a092469
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/common/application/menu/index.js
-1
View File
@@ -226,7 +226,6 @@ var Menu = new prime({
}, },
_checkQuery: function(mq) { _checkQuery: function(mq) {
var selectors = this.options.selectors, var selectors = this.options.selectors,
mobileContainer = $(selectors.mobileContainer), mobileContainer = $(selectors.mobileContainer),
mainContainer = $(selectors.mainContainer), mainContainer = $(selectors.mainContainer),
assets/common/application/offcanvas/index.js
+14 -9
View File
@@ -10,6 +10,7 @@ var ready = require('domready'),
forEach = require('mout/array/forEach'), forEach = require('mout/array/forEach'),
mapNumber = require('mout/math/map'), mapNumber = require('mout/math/map'),
clamp = require('mout/math/clamp'), clamp = require('mout/math/clamp'),
timeout = require('mout/function/timeout'),
trim = require('mout/string/trim'), trim = require('mout/string/trim'),
decouple = require('../utils/decouple'), decouple = require('../utils/decouple'),
Bound = require('prime-util/prime/bound'), Bound = require('prime-util/prime/bound'),
@@ -336,8 +337,8 @@ var Offcanvas = new prime({
_checkTogglers: function(mutator) { _checkTogglers: function(mutator) {
var togglers = $('[data-offcanvas-toggle], [data-offcanvas-open], [data-offcanvas-close]'), var togglers = $('[data-offcanvas-toggle], [data-offcanvas-open], [data-offcanvas-close]'),
blocks = this.offcanvas.search('.g-block'), mobileContainer = $('#g-mobilemenu-container'),
mobileContainer = $('#g-mobilemenu-container'); blocks;
// if there is no mobile menu there's no need to check the offcanvas mutation // if there is no mobile menu there's no need to check the offcanvas mutation
if (!mobileContainer) { if (!mobileContainer) {
@@ -348,14 +349,18 @@ var Offcanvas = new prime({
if (!togglers || (mutator && ((mutator.target || mutator.srcElement) !== mobileContainer[0]))) { return; } if (!togglers || (mutator && ((mutator.target || mutator.srcElement) !== mobileContainer[0]))) { return; }
if (this.opened) { this.close(); } if (this.opened) { this.close(); }
var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length; timeout(function(){
togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide'); blocks = this.offcanvas.search('.g-block');
var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length;
if (!shouldCollapse && !this.attached) { this.attach(); } togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide');
else if (shouldCollapse && this.attached) {
this.detach(); if (!shouldCollapse && !this.attached) { this.attach(); }
this.attachMutationEvent(); else if (shouldCollapse && this.attached) {
} this.detach();
this.attachMutationEvent();
}
}, 0, this);
} }
}); });
assets/common/js/main.js
+15 -11
View File
@@ -248,7 +248,6 @@ var Menu = new prime({
}, },
_checkQuery: function(mq) { _checkQuery: function(mq) {
var selectors = this.options.selectors, var selectors = this.options.selectors,
mobileContainer = $(selectors.mobileContainer), mobileContainer = $(selectors.mobileContainer),
mainContainer = $(selectors.mainContainer), mainContainer = $(selectors.mainContainer),
@@ -280,6 +279,7 @@ var ready = require('domready'),
forEach = require('mout/array/forEach'), forEach = require('mout/array/forEach'),
mapNumber = require('mout/math/map'), mapNumber = require('mout/math/map'),
clamp = require('mout/math/clamp'), clamp = require('mout/math/clamp'),
timeout = require('mout/function/timeout'),
trim = require('mout/string/trim'), trim = require('mout/string/trim'),
decouple = require('../utils/decouple'), decouple = require('../utils/decouple'),
Bound = require('prime-util/prime/bound'), Bound = require('prime-util/prime/bound'),
@@ -606,8 +606,8 @@ var Offcanvas = new prime({
_checkTogglers: function(mutator) { _checkTogglers: function(mutator) {
var togglers = $('[data-offcanvas-toggle], [data-offcanvas-open], [data-offcanvas-close]'), var togglers = $('[data-offcanvas-toggle], [data-offcanvas-open], [data-offcanvas-close]'),
blocks = this.offcanvas.search('.g-block'), mobileContainer = $('#g-mobilemenu-container'),
mobileContainer = $('#g-mobilemenu-container'); blocks;
// if there is no mobile menu there's no need to check the offcanvas mutation // if there is no mobile menu there's no need to check the offcanvas mutation
if (!mobileContainer) { if (!mobileContainer) {
@@ -618,19 +618,23 @@ var Offcanvas = new prime({
if (!togglers || (mutator && ((mutator.target || mutator.srcElement) !== mobileContainer[0]))) { return; } if (!togglers || (mutator && ((mutator.target || mutator.srcElement) !== mobileContainer[0]))) { return; }
if (this.opened) { this.close(); } if (this.opened) { this.close(); }
var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length; timeout(function(){
togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide'); blocks = this.offcanvas.search('.g-block');
var shouldCollapse = (blocks && blocks.length == 1) && mobileContainer && !trim(this.offcanvas.text()).length;
if (!shouldCollapse && !this.attached) { this.attach(); } togglers[shouldCollapse ? 'addClass' : 'removeClass']('g-offcanvas-hide');
else if (shouldCollapse && this.attached) {
this.detach(); if (!shouldCollapse && !this.attached) { this.attach(); }
this.attachMutationEvent(); else if (shouldCollapse && this.attached) {
} this.detach();
this.attachMutationEvent();
}
}, 0, this);
} }
}); });
module.exports = Offcanvas; module.exports = Offcanvas;
},{"../utils/decouple":4,"domready":6,"elements":11,"elements/zen":38,"mout/array/forEach":39,"mout/function/bind":42,"mout/math/clamp":51,"mout/math/map":53,"mout/string/trim":62,"prime":80,"prime-util/prime/bound":76,"prime-util/prime/options":77}],4:[function(require,module,exports){ },{"../utils/decouple":4,"domready":6,"elements":11,"elements/zen":38,"mout/array/forEach":39,"mout/function/bind":42,"mout/function/timeout":46,"mout/math/clamp":51,"mout/math/map":53,"mout/string/trim":62,"prime":80,"prime-util/prime/bound":76,"prime-util/prime/options":77}],4:[function(require,module,exports){
'use strict'; 'use strict';
var rAF = (function() { var rAF = (function() {