From 1e1b349942a6e6fad9cd743592f63af49f6d100a Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Wed, 21 Feb 2018 13:12:17 +0100 Subject: [PATCH] Revert "fire opened.zf.offcanvas after adding the classes to prevent some race conditions" This reverts commit 58ca2385e966dc5fcd47f41b32b79fed62f2daa3. --- js/foundation.offcanvas.js | 10 +++++++--- test/javascript/components/offcanvas.js | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/js/foundation.offcanvas.js b/js/foundation.offcanvas.js index 6c46ce0aa..a5fb0cf6d 100644 --- a/js/foundation.offcanvas.js +++ b/js/foundation.offcanvas.js @@ -301,11 +301,15 @@ class OffCanvas extends Plugin { this.$element.siblings('[data-off-canvas-content]').css('transition-duration', ''); } + /** + * Fires when the off-canvas menu opens. + * @event OffCanvas#opened + */ this.$element.addClass('is-open').removeClass('is-closed'); - this.$triggers.attr('aria-expanded', 'true'); - this.$element.attr('aria-hidden', 'false'); - + this.$triggers.attr('aria-expanded', 'true'); + this.$element.attr('aria-hidden', 'false') + .trigger('opened.zf.offcanvas'); this.$content.addClass('is-open-' + this.position); diff --git a/test/javascript/components/offcanvas.js b/test/javascript/components/offcanvas.js index d5cace800..7938dbaf1 100644 --- a/test/javascript/components/offcanvas.js +++ b/test/javascript/components/offcanvas.js @@ -104,7 +104,7 @@ describe('Off Canvas', function() { plugin.$element.should.have.class('is-open'); $('body').should.have.class('is-off-canvas-open'); done(); - }, 1); + }, 30); }); plugin.open(); @@ -252,7 +252,7 @@ describe('Off Canvas', function() { plugin.toggle(); }); }); - + describe('keyboard events', function() { it('closes Off Canvas on ESCAPE', function(done) { $html = $(template).appendTo('body'); -- 2.47.2