Merge pull request #1 from nomensa/breakpoint-updates

Breakpoint updates
nomensa · Nov 4, 2014 · f19fc4d · f19fc4d
2 parents aba5288 + 7210150
commit f19fc4d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -111,6 +111,7 @@ $ grunt
 
 ## Release history
 
+ - 0.1.1 Updated destroy function to remove 'min-height' attribute
  - 0.1.0 Tagged stable version for release
 
 Copyright &copy; 2014 [@nomensa](http://nomensa.com)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-equal-heights",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "authors": [
     "(Nomensa <tech@nomensa.com>)"
   ],

diff --git a/equalHeightsSpec.js b/equalHeightsSpec.js
@@ -154,7 +154,6 @@ describe('equalHeights', function () {
                 breakpoint: '300'
             });
             testElement1.data('plugin_equalheights').destroy();
-            expect(testElement1.find('.column-inner').css('min-height')).toBe('0px');
             expect(testElement1.find('.column-inner').attr('style')).not.toContain('min-height: 350px');
         });
     });

diff --git a/index.html b/index.html
@@ -12,7 +12,7 @@
 
     <body>
         <div class="header">
-            <p><a href="http://nomensa.com?plugin"><img src="gh-pages/img/nomensa-logo.png" alt="Nomensa humanising technology" width="135" height="38"/></a></p>
+            <p><a href="http://nomensa.com?plugin"><img src="gh-pages/img/nomensa-logo.png" alt="Nomensa humanising technology" width="135" heaight="38"/></a></p>
         </div><!-- .header -->
 
         <div class="main" role="main">

diff --git a/jquery.equal-heights.js b/jquery.equal-heights.js
@@ -3,7 +3,7 @@
  *
  * @description: Ensures the elements matched are the height of the highest element.
  * @source: http://github.com/nomensa/jquery.equal-heights
- * @version: '0.1.0'
+ * @version: '0.1.1'
  *
  * @author: Nomensa
  * @license: licenced under MIT - http://opensource.org/licenses/mit-license.php
@@ -70,7 +70,7 @@
      return the dom to it's original form
      */
         return $('.' + this.options.target, this.element).each(function () {
-            $(this).css('min-height', 0);
+            $(this).css('min-height', '');
         });
 
     };

diff --git a/jquery.equal-heights.min.js b/jquery.equal-heights.min.js
@@ -3,9 +3,9 @@
  *
  * @description: Ensures the elements matched are the height of the highest element.
  * @source: http://github.com/nomensa/jquery.equal-heights
- * @version: '0.1.0'
+ * @version: '0.1.1'
  *
  * @author: Nomensa
  * @license: licenced under MIT - http://opensource.org/licenses/mit-license.php
  */
-!function(a,b){"use strict";function c(c,d){function f(){var c=a(b).width();if(c>g.options.breakpoint){var d=0;g.target.each(function(){a(this).height()>d&&(d=a(this).height())}),g.target.css({"min-height":d})}}var g=this;g.element=a(c),g.options=a.extend({},e,d),g.target=g.element.find("."+g.options.target),a(b).on("debouncedresize",function(){g.destroy(),f()}),f()}var d,e;d="equalheights",e={target:"column-inner",breakpoint:"768"},c.prototype.rebuild=function(){return new c(this.element,this.options)},c.prototype.destroy=function(){return a("."+this.options.target,this.element).each(function(){a(this).css("min-height",0)})},a.fn[d]=function(b){return this.each(function(){a.data(this,"plugin_"+d)||a.data(this,"plugin_"+d,new c(this,b))})}}(jQuery,window,document);
+!function(a,b){"use strict";function c(c,d){function f(){var c=a(b).width();if(c>g.options.breakpoint){var d=0;g.target.each(function(){a(this).height()>d&&(d=a(this).height())}),g.target.css({"min-height":d})}}var g=this;g.element=a(c),g.options=a.extend({},e,d),g.target=g.element.find("."+g.options.target),a(b).on("debouncedresize",function(){g.destroy(),f()}),f()}var d,e;d="equalheights",e={target:"column-inner",breakpoint:"768"},c.prototype.rebuild=function(){return new c(this.element,this.options)},c.prototype.destroy=function(){return a("."+this.options.target,this.element).each(function(){a(this).css("min-height","")})},a.fn[d]=function(b){return this.each(function(){a.data(this,"plugin_"+d)||a.data(this,"plugin_"+d,new c(this,b))})}}(jQuery,window,document);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery-equal-heights",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "description": "Ensures the elements matched are the height of the highest element.",
     "author": "Nomensa <tech@nomensa.com>",
     "repository": {