Skip to content

Min height fix #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radiolips merged 5 commits into from
Sep 13, 2017
Merged

Min height fix #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
030d1c5
lint issue fix (>120 char)
Sep 12, 2017
caffe02
use verticalMargin when calculating min height in rows
Sep 13, 2017
5b7af40
merge to latest
Sep 13, 2017
68932d6
use verticalMargin when calculating min height in rows
Sep 13, 2017
123cc01
Merge branch 'minHeight_fix' of github.com:adumesny/gridstack.js into…
Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
},
"scripts": {
"build": "grunt ; doctoc ./README.md ; doctoc ./doc/README.md ; doctoc ./doc/CHANGES.md",
"test": "grunt lint && karma start karma.conf.js"
"test": "grunt lint && karma start karma.conf.js",
"lint": "grunt lint"
Copy link
Member Author

@adumesny adumesny Sep 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added an explicit lint (makes it easier to check before commit) as for some reason it's not auto linting in Visual Studio code yet...

},
"keywords": [
"gridstack",
Expand Down
10 changes: 7 additions & 3 deletions src/gridstack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,9 +1033,13 @@
return;
}
var height = this.grid.getGridHeight();
var minHeight = parseInt(this.container.css('min-height')) / this.cellHeight();
if (height < minHeight) {
height = minHeight;
// check for css min height. Each row is cellHeight + verticalMargin, until last one which has no margin below
Copy link
Member Author

@adumesny adumesny Sep 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

real change - ignore the /dist files as they will be removed yet (merge hell)

var cssMinHeight = parseInt(this.container.css('min-height'));
if (cssMinHeight > 0) {
var minHeight = (cssMinHeight + this.opts.verticalMargin) / (this.cellHeight() + this.opts.verticalMargin);
if (height < minHeight) {
height = minHeight;
}
}
this.container.attr('data-gs-current-height', height);
if (!this.opts.cellHeight) {
Expand Down