Merge branch 'develop' into fix/10585_offcanvas_incanvas_option

# Conflicts:
#	js/foundation.offcanvas.js

diff --cc js/foundation.offcanvas.js
index d3139bc5f4b3d53507760a11a54ecee6657a3c95,58424469cc949ebf23176396cad6e7a66d70bd16..31b7c177437a25d06ba7f3dacb96ef479652cfef
--- 1/js/foundation.offcanvas.js
--- 2/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) {