]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
fix: trigger opened.zf.offcanvas at the end to prevent race conditions 10967/head
authorDaniel Ruf <daniel.ruf@ueberbit.de>
Wed, 21 Feb 2018 12:06:55 +0000 (13:06 +0100)
committerDaniel Ruf <daniel.ruf@ueberbit.de>
Wed, 21 Feb 2018 12:06:55 +0000 (13:06 +0100)
js/foundation.offcanvas.js

index 995bf91d4036568f3e865a33f5dbd0cb6faa64f8..080a18536072b7cca3a8f2e0094fda7e087bd005 100644 (file)
@@ -280,6 +280,7 @@ class OffCanvas extends Plugin {
    * @param {Object} event - Event object passed from listener.
    * @param {jQuery} trigger - element that triggered the off-canvas to open.
    * @fires OffCanvas#opened
+   * @todo also trigger 'open' event?
    */
   open(event, trigger) {
     if (this.$element.hasClass('is-open') || this.isRevealed) { return; }
@@ -301,15 +302,10 @@ 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')
-        .trigger('opened.zf.offcanvas');
+    this.$element.attr('aria-hidden', 'false');
 
     this.$content.addClass('is-open-' + this.position);
 
@@ -348,6 +344,12 @@ class OffCanvas extends Plugin {
     }
 
     this._addContentClasses();
+
+    /**
+     * Fires when the off-canvas menu opens.
+     * @event OffCanvas#opened
+     */
+    this.$element.trigger('opened.zf.offcanvas');
   }
 
   /**