From 2446ac654f694bc05a1297cbab0b2d875e278bbd Mon Sep 17 00:00:00 2001 From: liabru Date: Sun, 19 Feb 2017 18:25:16 +0000 Subject: [PATCH] rebuild with correct version number in place for npm --- CHANGELOG.md | 6 ++++++ bower.json | 2 +- dist/jquery.matchHeight-min.js | 4 ++-- dist/jquery.matchHeight.js | 4 ++-- package.json | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d78995..3cff683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ + +## 0.7.2 (2017-02-19) + + + + ## 0.7.1 (2017-02-19) diff --git a/bower.json b/bower.json index 9c2452b..2c8256c 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "matchHeight", - "version": "0.7.1", + "version": "0.7.2", "homepage": "https://github.com/liabru/jquery-match-height", "authors": [ "Liam Brummitt (http://brm.io/)" diff --git a/dist/jquery.matchHeight-min.js b/dist/jquery.matchHeight-min.js index 9e51729..50936e8 100644 --- a/dist/jquery.matchHeight-min.js +++ b/dist/jquery.matchHeight-min.js @@ -1,10 +1,10 @@ /* -* jquery-match-height 0.7.1 by @liabru +* jquery-match-height 0.7.2 by @liabru * http://brm.io/jquery-match-height/ * License MIT */ !function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):t(jQuery)}(function(t){var e=-1,o=-1,n=function(t){return parseFloat(t)||0},a=function(e){var o=1,a=t(e),i=null,r=[];return a.each(function(){var e=t(this),a=e.offset().top-n(e.css("margin-top")),s=r.length>0?r[r.length-1]:null;null===s?r.push(e):Math.floor(Math.abs(i-a))<=o?r[r.length-1]=s.add(e):r.push(e),i=a}),r},i=function(e){var o={ -byRow:!0,property:"height",target:null,remove:!1};return"object"==typeof e?t.extend(o,e):("boolean"==typeof e?o.byRow=e:"remove"===e&&(o.remove=!0),o)},r=t.fn.matchHeight=function(e){var o=i(e);if(o.remove){var n=this;return this.css(o.property,""),t.each(r._groups,function(t,e){e.elements=e.elements.not(n)}),this}return this.length<=1&&!o.target?this:(r._groups.push({elements:this,options:o}),r._apply(this,o),this)};r.version="0.7.1",r._groups=[],r._throttle=80,r._maintainScroll=!1,r._beforeUpdate=null, +byRow:!0,property:"height",target:null,remove:!1};return"object"==typeof e?t.extend(o,e):("boolean"==typeof e?o.byRow=e:"remove"===e&&(o.remove=!0),o)},r=t.fn.matchHeight=function(e){var o=i(e);if(o.remove){var n=this;return this.css(o.property,""),t.each(r._groups,function(t,e){e.elements=e.elements.not(n)}),this}return this.length<=1&&!o.target?this:(r._groups.push({elements:this,options:o}),r._apply(this,o),this)};r.version="0.7.2",r._groups=[],r._throttle=80,r._maintainScroll=!1,r._beforeUpdate=null, r._afterUpdate=null,r._rows=a,r._parse=n,r._parseOptions=i,r._apply=function(e,o){var s=i(o),h=t(e),l=[h],c=t(window).scrollTop(),p=t("html").outerHeight(!0),u=h.parents().filter(":hidden");return u.each(function(){var e=t(this);e.data("style-cache",e.attr("style"))}),u.css("display","block"),s.byRow&&!s.target&&(h.each(function(){var e=t(this),o=e.css("display");"inline-block"!==o&&"flex"!==o&&"inline-flex"!==o&&(o="block"),e.data("style-cache",e.attr("style")),e.css({display:o,"padding-top":"0", "padding-bottom":"0","margin-top":"0","margin-bottom":"0","border-top-width":"0","border-bottom-width":"0",height:"100px",overflow:"hidden"})}),l=a(h),h.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||"")})),t.each(l,function(e,o){var a=t(o),i=0;if(s.target)i=s.target.outerHeight(!1);else{if(s.byRow&&a.length<=1)return void a.css(s.property,"");a.each(function(){var e=t(this),o=e.attr("style"),n=e.css("display");"inline-block"!==n&&"flex"!==n&&"inline-flex"!==n&&(n="block");var a={ display:n};a[s.property]="",e.css(a),e.outerHeight(!1)>i&&(i=e.outerHeight(!1)),o?e.attr("style",o):e.css("display","")})}a.each(function(){var e=t(this),o=0;s.target&&e.is(s.target)||("border-box"!==e.css("box-sizing")&&(o+=n(e.css("border-top-width"))+n(e.css("border-bottom-width")),o+=n(e.css("padding-top"))+n(e.css("padding-bottom"))),e.css(s.property,i-o+"px"))})}),u.each(function(){var e=t(this);e.attr("style",e.data("style-cache")||null)}),r._maintainScroll&&t(window).scrollTop(c/p*t("html").outerHeight(!0)), diff --git a/dist/jquery.matchHeight.js b/dist/jquery.matchHeight.js index bd5872f..48925b5 100644 --- a/dist/jquery.matchHeight.js +++ b/dist/jquery.matchHeight.js @@ -1,5 +1,5 @@ /** -* jquery-match-height 0.7.1 by @liabru +* jquery-match-height 0.7.2 by @liabru * http://brm.io/jquery-match-height/ * License: MIT */ @@ -143,7 +143,7 @@ * plugin global options */ - matchHeight.version = '0.7.1'; + matchHeight.version = '0.7.2'; matchHeight._groups = []; matchHeight._throttle = 80; matchHeight._maintainScroll = false; diff --git a/package.json b/package.json index 6d57fc1..2e0bb80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jquery-match-height", - "version": "0.7.1", + "version": "0.7.2", "license": "MIT", "homepage": "http://brm.io/jquery-match-height/", "author": "Liam Brummitt (http://brm.io/)",