Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
open-source
gridstack.js
Commits
2037a70f
Commit
2037a70f
authored
Sep 06, 2017
by
radiolips
Committed by
GitHub
Sep 06, 2017
Browse files
Merge pull request #672 from datou3600/develop
bug fix: keep this._styles._max increasing
parents
32a20d30
a38d78ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/gridstack.js
View file @
2037a70f
...
...
@@ -947,14 +947,14 @@
if
(
typeof
maxHeight
==
'
undefined
'
)
{
maxHeight
=
this
.
_styles
.
_max
;
}
if
(
this
.
_styles
.
_max
!==
0
&&
maxHeight
<=
this
.
_styles
.
_max
)
{
// Keep this._styles._max increasing
return
;
}
this
.
_initStyles
();
this
.
_updateContainerHeight
();
if
(
!
this
.
opts
.
cellHeight
)
{
// The rest will be handled by CSS
return
;
}
if
(
this
.
_styles
.
_max
!==
0
&&
maxHeight
<=
this
.
_styles
.
_max
)
{
return
;
}
if
(
!
this
.
opts
.
verticalMargin
||
this
.
opts
.
cellHeightUnit
===
this
.
opts
.
verticalMarginUnit
)
{
getHeight
=
function
(
nbRows
,
nbMargins
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment