From: Chris Oyler Date: Thu, 17 Dec 2015 22:09:31 +0000 (-0800) Subject: adds destroy method to offcanvas and removes Foundation.Move from close function X-Git-Tag: v6.1.0~5^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae4decd526354fb2c0e66a3d65d0d3255ab5cfea;p=thirdparty%2Ffoundation%2Ffoundation-sites.git adds destroy method to offcanvas and removes Foundation.Move from close function --- diff --git a/js/foundation.offcanvas.js b/js/foundation.offcanvas.js index c704a37f5..76d97f0b8 100644 --- a/js/foundation.offcanvas.js +++ b/js/foundation.offcanvas.js @@ -251,19 +251,19 @@ OffCanvas.prototype.open = function(event, trigger) { /** * Closes the off-canvas menu. * @function + * @param {Function} cb - optional cb to fire after closure. * @fires OffCanvas#closed */ -OffCanvas.prototype.close = function() { +OffCanvas.prototype.close = function(cb) { if(!this.$element.hasClass('is-open')){ return; } var _this = this; - Foundation.Move(this.options.transitionTime, this.$element, function(){ - $('[data-off-canvas-wrapper]').removeClass('is-off-canvas-open is-open-'+_this.options.position); - - _this.$element.removeClass('is-open'); + // Foundation.Move(this.options.transitionTime, this.$element, function(){ + $('[data-off-canvas-wrapper]').removeClass('is-off-canvas-open is-open-' + _this.options.position); + _this.$element.removeClass('is-open'); // Foundation._reflow(); - }); + // }); this.$element.attr('aria-hidden', 'true') /** * Fires when the off-canvas menu opens. @@ -278,6 +278,7 @@ OffCanvas.prototype.close = function() { // } this.$lastTrigger.attr('aria-expanded', 'false'); + }; /** @@ -313,7 +314,11 @@ OffCanvas.prototype._handleKeyboard = function(event) { * @function */ OffCanvas.prototype.destroy = function(){ - //TODO make this... + this.close(); + this.$element.off('.zf.trigger .zf.offcanvas'); + this.$exiter.off('.zf.offcanvas'); + + Foundation.unregisterPlugin(this); }; Foundation.plugin(OffCanvas, 'OffCanvas');