From: SassNinja <kai.falkowski@gmail.com>
Date: Tue, 20 Mar 2018 09:28:48 +0000 (+0100)
Subject: Merge branch 'develop' into fix/10585_offcanvas_incanvas_option
X-Git-Tag: v6.6.0~3^2~243^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10969%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into fix/10585_offcanvas_incanvas_option

# Conflicts:
#	js/foundation.offcanvas.js
---

4858ec512982acd7c7d812e55ead90432e7116b5
diff --cc js/foundation.offcanvas.js
index d3139bc5f,58424469c..31b7c1774
--- a/js/foundation.offcanvas.js
+++ b/js/foundation.offcanvas.js
@@@ -170,15 -155,8 +170,15 @@@ class OffCanvas extends Plugin 
  
      if (this.options.closeOnClick === true) {
        var $target = this.options.contentOverlay ? this.$overlay : this.$content;
-       $target.on({'click.zf.offcanvas': this.close.bind(this)});
+       $target.on({'click.zf.offCanvas': this.close.bind(this)});
      }
 +
 +    if (this.options.inCanvasOn) {
 +      $(window).on('changed.zf.mediaquery', () => {
 +        this._checkInCanvas();
 +      });
 +    }
 +
    }
  
    /**
@@@ -313,9 -280,10 +313,10 @@@
     * @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; }
 +    if (this.$element.hasClass('is-open') || this.isRevealed || this.isInCanvas) { return; }
      var _this = this;
  
      if (trigger) {