From: Chris Oyler <chris@zurb.com>
Date: Fri, 18 Dec 2015 00:47:39 +0000 (-0800)
Subject: Merge branch '6.1' of https://github.com/zurb/foundation-sites into abide
X-Git-Tag: v6.1.0~4^2^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1acca82cd0047e69905218b83f7177ad8a5adf3;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch '6.1' of https://github.com/zurb/foundation-sites into abide
---

a1acca82cd0047e69905218b83f7177ad8a5adf3
diff --cc js/foundation.abide.js
index 966fbfe80,9247c10bf..1f3f7ac2a
--- a/js/foundation.abide.js
+++ b/js/foundation.abide.js
@@@ -11,10 -11,14 +11,10 @@@
    function Abide(element, options) {
      this.$element = element;
      this.options  = $.extend({}, Abide.defaults, this.$element.data(), options);
 -    this.$window  = $(window);
 -    this.name     = 'Abide';
 -    this.attr     = 'data-abide';
  
      this._init();
 -    this._events();
  
-     Foundation.registerPlugin(this);
+     Foundation.registerPlugin(this, 'Abide');
    }
  
    /**