Skip to content

Commit

Permalink
Updated minified file
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasramo committed Nov 7, 2016
1 parent 5be7a09 commit d3073a8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,12 @@ mezr.width(elem, 'padding');
// Element content width + left/right padding + vertical scrollbar width.
mezr.width(elem, 'scroll');

// Element content width + left/right padding + vertical scrollbar width + left/right border.
// Element content width + left/right padding + vertical scrollbar width +
// left/right border.
mezr.width(elem, 'border'); // or just -> mezr.width(elem);

// Element content width + left/right padding + vertical scrollbar width + left/right border + left/right (positive) margin.
// Element content width + left/right padding + vertical scrollbar width +
// left/right border + left/right (positive) margin.
mezr.width(elem, 'margin');
```

Expand Down Expand Up @@ -183,10 +185,12 @@ mezr.height(elem, 'padding');
// Element content height + top/bottom padding + horizontal scrollbar height.
mezr.height(elem, 'scroll');

// Element content height + top/bottom padding + horizontal scrollbar height + top/bottom border.
// Element content height + top/bottom padding + horizontal scrollbar height +
// top/bottom border.
mezr.height(elem, 'border'); // or just -> mezr.height(elem);

// Element content height + top/bottom padding + horizontal scrollbar height + top/bottom border + top/bottom (positive) margin.
// Element content height + top/bottom padding + horizontal scrollbar height +
// top/bottom border + top/bottom (positive) margin.
mezr.height(elem, 'margin');
```

Expand Down Expand Up @@ -456,13 +460,15 @@ mezr.intersection(elemA, elemB);
// Calculate the intersection area between two objects.
mezr.intersection(rectA, rectB);

// Calculate the intersection area between an object and an element.
// Calculate the intersection area between an object and an
// element.
mezr.intersection(elemA, rectB);

// Define which edge to use for element calculations
mezr.intersection([elemA, 'content'], [elemB, 'scroll']);

// Calculate the intersection area between two elements and two objects.
// Calculate the intersection area between two elements and
// two objects.
mezr.intersection(elemA, [elemB, 'margin'], rectA, rectB);
```

Expand Down
4 changes: 2 additions & 2 deletions mezr.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tests/modules/place.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ TestSuite.modules.push(function () {

});


QUnit.test('#critical: An extensive test with all possible positioining variations, css positions and edge layers.', function (assert) {

var done = assert.async();
Expand Down

0 comments on commit d3073a8

Please sign in to comment.