@@ -983,19 +983,20 @@ function ($value) {
983
983
984
984
// Build array of items
985
985
if (!empty ($ arrField ['eval ' ]['columnPos ' ])) {
986
- $ arrItems [$ i ][$ objWidget ->columnPos ]['entry ' ] =
986
+ $ arrItems [$ i ][$ objWidget ->columnPos ]['entry ' ] =
987
987
($ arrItems [$ i ][$ objWidget ->columnPos ]['entry ' ] ?? '' ) . $ strWidget ;
988
- $ arrItems [$ i ][$ objWidget ->columnPos ]['valign ' ] = ($ arrField ['eval ' ]['valign ' ] ?? '' );
989
- $ arrItems [$ i ][$ objWidget ->columnPos ]['tl_class ' ] = ($ arrField ['eval ' ]['tl_class ' ] ?? '' );
990
- $ arrItems [$ i ][$ objWidget ->columnPos ]['hide ' ] = $ blnHiddenBody ;
988
+ $ arrItems [$ i ][$ objWidget ->columnPos ]['valign ' ] = ($ arrField ['eval ' ]['valign ' ] ?? '' );
989
+ $ arrItems [$ i ][$ objWidget ->columnPos ]['tl_class ' ] = ($ arrField ['eval ' ]['tl_class ' ] ?? '' );
990
+ $ arrItems [$ i ][$ objWidget ->columnPos ]['wrapper_style ' ] = ($ arrField ['eval ' ]['wrapper_style ' ] ?? '' );
991
+ $ arrItems [$ i ][$ objWidget ->columnPos ]['hide ' ] = $ blnHiddenBody ;
991
992
} else {
992
- $ arrItems [$ i ][$ strKey ] = array
993
- (
994
- 'entry ' => $ strWidget ,
995
- 'valign ' => $ arrField ['eval ' ]['valign ' ] ?? null ,
996
- 'tl_class ' => $ arrField ['eval ' ]['tl_class ' ] ?? null ,
997
- 'hide ' => $ blnHiddenBody
998
- ) ;
993
+ $ arrItems [$ i ][$ strKey ] = [
994
+ ' entry ' => $ strWidget ,
995
+ 'valign ' => $ arrField [ ' eval ' ][ ' valign ' ] ?? null ,
996
+ 'tl_class ' => $ arrField ['eval ' ]['tl_class ' ] ?? null ,
997
+ 'wrapper_style ' => $ arrField ['eval ' ]['wrapper_style ' ] ?? null ,
998
+ 'hide ' => $ blnHiddenBody
999
+ ] ;
999
1000
}
1000
1001
}
1001
1002
}
@@ -1545,8 +1546,9 @@ protected function generateTable(
1545
1546
}
1546
1547
1547
1548
$ return .= '<td '
1548
- . ($ itemValue ['valign ' ] != '' ? ' valign=" ' . $ itemValue ['valign ' ] . '" ' : '' )
1549
- . ($ itemValue ['tl_class ' ] != '' ? ' class=" ' . $ itemValue ['tl_class ' ] . '" ' : '' )
1549
+ . ($ itemValue ['valign ' ] !== '' ? ' valign=" ' . $ itemValue ['valign ' ] . '" ' : '' )
1550
+ . ($ itemValue ['tl_class ' ] !== '' ? ' class=" ' . $ itemValue ['tl_class ' ] . '" ' : '' )
1551
+ . ($ itemValue ['wrapper_style ' ] !== '' ? ' style=" ' . $ itemValue ['wrapper_style ' ] . '" ' : '' )
1550
1552
. '> '
1551
1553
. $ itemValue ['entry ' ]
1552
1554
. '</td> ' ;
@@ -1665,7 +1667,7 @@ protected function generateDiv(
1665
1667
$ arrColorpicker ,
1666
1668
$ strHidden ,
1667
1669
$ arrItems ,
1668
- $ arrHiddenHeader = array ()
1670
+ $ arrHiddenHeader = []
1669
1671
) {
1670
1672
// generate header fields
1671
1673
foreach ($ this ->columnFields as $ strKey => $ arrField ) {
@@ -1708,17 +1710,20 @@ protected function generateDiv(
1708
1710
1709
1711
1710
1712
// new array for items so we get rid of the ['entry'] and ['valign']
1711
- $ arrReturnItems = array () ;
1713
+ $ arrReturnItems = [] ;
1712
1714
1713
1715
foreach ($ arrItems as $ itemKey => $ itemValue ) {
1714
1716
if ($ itemValue ['hide ' ]) {
1715
1717
$ itemValue ['tl_class ' ] .= ' hidden ' ;
1716
1718
}
1717
1719
1718
1720
$ arrReturnItems [$ itemKey ] = '<div '
1719
- . ($ itemValue ['tl_class ' ] != ''
1721
+ . ($ itemValue ['tl_class ' ] !== ''
1720
1722
? ' class=" ' . $ itemValue ['tl_class ' ] . '" '
1721
1723
: '' )
1724
+ . ($ itemValue ['wrapper_style ' ] !== ''
1725
+ ? ' style=" ' . $ itemValue ['wrapper_style ' ] . '" '
1726
+ : '' )
1722
1727
. '> '
1723
1728
. $ itemValue ['entry ' ]
1724
1729
. '</div> ' ;
0 commit comments