Skip to content

Commit a9ca991

Browse files
committed
release 0.7.0
1 parent 98f0dfb commit a9ca991

File tree

5 files changed

+128
-22
lines changed

5 files changed

+128
-22
lines changed

CHANGELOG.md

+75-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,76 @@
1+
<a name="0.7.0"></a>
2+
# 0.7.0 (2016-01-04)
3+
4+
### release summary
5+
6+
* added build tasks
7+
* added selenium unit tests
8+
* added lint tests
9+
* added `matchHeight.version` property
10+
* added to npm
11+
12+
* fixed unitless properties
13+
* fixed inline styles being removed
14+
* fixed `display: flex` issue
15+
* fixed `display: inline-flex` issue
16+
* fixed row detection when items contain floating elements
17+
* fixed compatibility for module loaders
18+
19+
### commit log
20+
21+
* add custom version argument to gulp build ([ad8aac5](https://github.com/liabru/jquery-match-height/commit/ad8aac5))
22+
* add delay to jasmine boot ([30824fb](https://github.com/liabru/jquery-match-height/commit/30824fb))
23+
* add lint to all test tasks ([6b16f67](https://github.com/liabru/jquery-match-height/commit/6b16f67))
24+
* add test for _parse on string values with units ([4a64208](https://github.com/liabru/jquery-match-height/commit/4a64208))
25+
* add to npm ([0055660](https://github.com/liabru/jquery-match-height/commit/0055660))
26+
* added a section on tests to readme ([e0be682](https://github.com/liabru/jquery-match-height/commit/e0be682))
27+
* added changelog task ([5263ab1](https://github.com/liabru/jquery-match-height/commit/5263ab1))
28+
* added cloud selenium, local emulated ie testing, lint task, build task, release task, improved tests ([06bd876](https://github.com/liabru/jquery-match-height/commit/06bd876))
29+
* added gulpfile, jasmine test specs, browser test runner, selenium test runner ([ca926de](https://github.com/liabru/jquery-match-height/commit/ca926de))
30+
* added libscore ([03a4317](https://github.com/liabru/jquery-match-height/commit/03a4317))
31+
* added matchHeight.version property ([431e4d0](https://github.com/liabru/jquery-match-height/commit/431e4d0))
32+
* added release tasks ([49cc72f](https://github.com/liabru/jquery-match-height/commit/49cc72f))
33+
* added test for property option ([7bdada7](https://github.com/liabru/jquery-match-height/commit/7bdada7))
34+
* added test for remove ([445799d](https://github.com/liabru/jquery-match-height/commit/445799d))
35+
* added tests for custom toBeWithinTolerance matcher ([a89b1c2](https://github.com/liabru/jquery-match-height/commit/a89b1c2))
36+
* bump jquery package version ([cc9c416](https://github.com/liabru/jquery-match-height/commit/cc9c416))
37+
* change tests to use jquery type checking functions ([6cf52f0](https://github.com/liabru/jquery-match-height/commit/6cf52f0))
38+
* faster selenium testing ([a6b2da3](https://github.com/liabru/jquery-match-height/commit/a6b2da3))
39+
* fix bower instructions in readme ([91e50ad](https://github.com/liabru/jquery-match-height/commit/91e50ad))
40+
* fix for display: inline-flex, closes #68 ([e769b9f](https://github.com/liabru/jquery-match-height/commit/e769b9f)), closes [#68](https://github.com/liabru/jquery-match-height/issues/68)
41+
* fix for unitless properties by forcing px, closes #64 ([d8cc365](https://github.com/liabru/jquery-match-height/commit/d8cc365)), closes [#64](https://github.com/liabru/jquery-match-height/issues/64)
42+
* fix issue maintaining inline styles, closes #95 ([878ff96](https://github.com/liabru/jquery-match-height/commit/878ff96)), closes [#95](https://github.com/liabru/jquery-match-height/issues/95)
43+
* fix issue with 'display:flex', closes #77 ([dc53a49](https://github.com/liabru/jquery-match-height/commit/dc53a49)), closes [#77](https://github.com/liabru/jquery-match-height/issues/77)
44+
* fix issues with build script ([1195421](https://github.com/liabru/jquery-match-height/commit/1195421))
45+
* fix linter issues ([0165e74](https://github.com/liabru/jquery-match-height/commit/0165e74))
46+
* Fix package manager registries URLs ([036df1b](https://github.com/liabru/jquery-match-height/commit/036df1b))
47+
* fixed local test config for non-windows ([d67ca25](https://github.com/liabru/jquery-match-height/commit/d67ca25))
48+
* fixed missing dependencies ([c608b80](https://github.com/liabru/jquery-match-height/commit/c608b80))
49+
* handle error when test server is already running ([9e6487d](https://github.com/liabru/jquery-match-height/commit/9e6487d))
50+
* ignore linebreak style on lint ([1510b58](https://github.com/liabru/jquery-match-height/commit/1510b58))
51+
* Improve row detection when cells contain floating contents ([8844acb](https://github.com/liabru/jquery-match-height/commit/8844acb))
52+
* improved readme ([1cf2c27](https://github.com/liabru/jquery-match-height/commit/1cf2c27))
53+
* improved tasks ([61a9ed4](https://github.com/liabru/jquery-match-height/commit/61a9ed4))
54+
* improved tests ([b1cadb5](https://github.com/liabru/jquery-match-height/commit/b1cadb5))
55+
* Make plugin compatible with module loaders ([b5988c1](https://github.com/liabru/jquery-match-height/commit/b5988c1))
56+
* Merge branch 'feature/tests' into develop ([a7d35dc](https://github.com/liabru/jquery-match-height/commit/a7d35dc))
57+
* Merge branch 'floatingcontents' of https://github.com/jorrit/jquery-match-height into jorrit-floatin ([89b74a7](https://github.com/liabru/jquery-match-height/commit/89b74a7))
58+
* Merge branch 'jorrit-floatingcontents' ([dc9716b](https://github.com/liabru/jquery-match-height/commit/dc9716b))
59+
* Merge pull request #81 from afelicioni/patch-1 ([c5566da](https://github.com/liabru/jquery-match-height/commit/c5566da))
60+
* Merge pull request #82 from JulienMelissas/patch-1 ([63d8ca4](https://github.com/liabru/jquery-match-height/commit/63d8ca4))
61+
* remove ie testing meta tags ([44ed2fe](https://github.com/liabru/jquery-match-height/commit/44ed2fe))
62+
* replace browserstack tunnel with ngrok ([2c67ca0](https://github.com/liabru/jquery-match-height/commit/2c67ca0))
63+
* run webdriver spec for all breakpoints ([3440598](https://github.com/liabru/jquery-match-height/commit/3440598))
64+
* update master build ([df2e0c2](https://github.com/liabru/jquery-match-height/commit/df2e0c2))
65+
* update master build ([f4b4b98](https://github.com/liabru/jquery-match-height/commit/f4b4b98))
66+
* updated min file ([99648ca](https://github.com/liabru/jquery-match-height/commit/99648ca))
67+
* use a spy for callback tests ([a72a2cf](https://github.com/liabru/jquery-match-height/commit/a72a2cf))
68+
* use gutil.log ([00a91bc](https://github.com/liabru/jquery-match-height/commit/00a91bc))
69+
* use local test images ([02398d9](https://github.com/liabru/jquery-match-height/commit/02398d9))
70+
* Use unminified version in Bower's "main" argument ([eedca73](https://github.com/liabru/jquery-match-height/commit/eedca73))
71+
72+
73+
174
<a name="0.6.0"></a>
275
# 0.6.0 (2015-03-31)
376

@@ -67,7 +140,7 @@
67140

68141

69142
<a name="0.5.2"></a>
70-
## 0.5.2 (2014-06-10)
143+
# 0.5.2 (2014-06-10)
71144

72145
### release summary
73146

@@ -89,7 +162,7 @@
89162

90163

91164
<a name="0.5.1"></a>
92-
## 0.5.1 (2014-04-15)
165+
# 0.5.1 (2014-04-15)
93166

94167
### release summary
95168

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matchHeight",
3-
"version": "0.6.0",
3+
"version": "0.7.0",
44
"homepage": "https://github.com/liabru/jquery-match-height",
55
"authors": [
66
"Liam Brummitt <[email protected]> (http://brm.io/)"

dist/jquery.matchHeight-min.js

+10-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.matchHeight.js

+41-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
/**
2-
* jquery.matchHeight.js v0.6.0
2+
* jquery-match-height 0.7.0 by @liabru
33
* http://brm.io/jquery-match-height/
44
* License: MIT
55
*/
66

7-
;(function($) {
7+
;(function(factory) { // eslint-disable-line no-extra-semi
8+
'use strict';
9+
if (typeof define === 'function' && define.amd) {
10+
// AMD
11+
define(['jquery'], factory);
12+
} else if (typeof module !== 'undefined' && module.exports) {
13+
// CommonJS
14+
module.exports = factory(require('jquery'));
15+
} else {
16+
// Global
17+
factory(jQuery);
18+
}
19+
})(function($) {
820
/*
921
* internal
1022
*/
@@ -131,11 +143,15 @@
131143
* plugin global options
132144
*/
133145

146+
matchHeight.version = '0.7.0';
134147
matchHeight._groups = [];
135148
matchHeight._throttle = 80;
136149
matchHeight._maintainScroll = false;
137150
matchHeight._beforeUpdate = null;
138151
matchHeight._afterUpdate = null;
152+
matchHeight._rows = _rows;
153+
matchHeight._parse = _parse;
154+
matchHeight._parseOptions = _parseOptions;
139155

140156
/*
141157
* matchHeight._apply
@@ -169,7 +185,12 @@
169185
// must first force an arbitrary equal height so floating elements break evenly
170186
$elements.each(function() {
171187
var $that = $(this),
172-
display = $that.css('display') === 'inline-block' ? 'inline-block' : 'block';
188+
display = $that.css('display');
189+
190+
// temporarily force a usable display value
191+
if (display !== 'inline-block' && display !== 'flex' && display !== 'inline-flex') {
192+
display = 'block';
193+
}
173194

174195
// cache the original inline style
175196
$that.data('style-cache', $that.attr('style'));
@@ -182,7 +203,8 @@
182203
'margin-bottom': '0',
183204
'border-top-width': '0',
184205
'border-bottom-width': '0',
185-
'height': '100px'
206+
'height': '100px',
207+
'overflow': 'hidden'
186208
});
187209
});
188210

@@ -210,7 +232,13 @@
210232
// iterate the row and find the max height
211233
$row.each(function(){
212234
var $that = $(this),
213-
display = $that.css('display') === 'inline-block' ? 'inline-block' : 'block';
235+
style = $that.attr('style'),
236+
display = $that.css('display');
237+
238+
// temporarily force a usable display value
239+
if (display !== 'inline-block' && display !== 'flex' && display !== 'inline-flex') {
240+
display = 'block';
241+
}
214242

215243
// ensure we get the correct actual height (and not a previously set height value)
216244
var css = { 'display': display };
@@ -222,8 +250,12 @@
222250
targetHeight = $that.outerHeight(false);
223251
}
224252

225-
// revert display block
226-
$that.css('display', '');
253+
// revert styles
254+
if (style) {
255+
$that.attr('style', style);
256+
} else {
257+
$that.css('display', '');
258+
}
227259
});
228260
} else {
229261
// if target set, use the height of the target element
@@ -247,7 +279,7 @@
247279
}
248280

249281
// set the height (accounting for padding and border)
250-
$that.css(opts.property, targetHeight - verticalPadding);
282+
$that.css(opts.property, (targetHeight - verticalPadding) + 'px');
251283
});
252284
});
253285

@@ -350,4 +382,4 @@
350382
matchHeight._update(true, event);
351383
});
352384

353-
})(jQuery);
385+
});

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-match-height",
3-
"version": "0.6.0",
3+
"version": "0.7.0",
44
"license": "MIT",
55
"homepage": "http://brm.io/jquery-match-height/",
66
"author": "Liam Brummitt <[email protected]> (http://brm.io/)",

0 commit comments

Comments
 (0)