Limit colspan to the number columns
Since e5446fb8d4ce the colspan value is used the grid css rules so it must be limited to the number of columns. Closes #12655
This commit is contained in:
1 parent
b43f3165fb
commit
bace374c3e
1 file changed
+8
-3
@@ -560,9 +560,14 @@ function eval_pyson(value){
|
||||
if (xexpand === undefined) xexpand = 1;
|
||||
|
||||
// CSS grid elements are 1-indexed
|
||||
if ((this.col > 0) && ((this._col + colspan) > (this.col + 1))) {
|
||||
this._col = 1;
|
||||
this._row += 1;
|
||||
if (this.col > 0) {
|
||||
if (colspan > this.col) {
|
||||
colspan = this.col;
|
||||
}
|
||||
if ((this._col + colspan) > (this.col + 1)) {
|
||||
this._col = 1;
|
||||
this._row += 1;
|
||||
}
|
||||
}
|
||||
|
||||
var el;
|
||||
|
||||
Reference in new issue
Block a user