tryton-sao 6.0.20 → 6.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG +3 -0
- package/dist/tryton-sao.js +6 -4
- package/dist/tryton-sao.min.js +2 -2
- package/package.json +1 -1
- package/src/view/form.js +6 -4
package/package.json
CHANGED
package/src/view/form.js
CHANGED
|
@@ -567,7 +567,7 @@ function eval_pyson(value){
|
|
|
567
567
|
i = 0;
|
|
568
568
|
row.children().map(function() {
|
|
569
569
|
var cell = jQuery(this);
|
|
570
|
-
var colspan = Math.min(Number(cell.attr('colspan')), col);
|
|
570
|
+
var colspan = Math.min(Number(cell.attr('colspan')), col || 1);
|
|
571
571
|
if (cell.hasClass('xexpand') &&
|
|
572
572
|
(!jQuery.isEmptyObject(cell.children())) &&
|
|
573
573
|
(cell.children(':not(.tooltip)').css('display') != 'none')) {
|
|
@@ -587,7 +587,7 @@ function eval_pyson(value){
|
|
|
587
587
|
var reduce = function(previous, current) {
|
|
588
588
|
var cell = current[0];
|
|
589
589
|
var colspan = Math.min(
|
|
590
|
-
Number(cell.attr('colspan')), col);
|
|
590
|
+
Number(cell.attr('colspan')), col || 1);
|
|
591
591
|
return previous + colspan;
|
|
592
592
|
};
|
|
593
593
|
return a.reduce(reduce, 0) - b.reduce(reduce, 0);
|
|
@@ -602,7 +602,8 @@ function eval_pyson(value){
|
|
|
602
602
|
xexpands.forEach(function(e) {
|
|
603
603
|
var cell = e[0];
|
|
604
604
|
i = e[1];
|
|
605
|
-
var colspan = Math.min(
|
|
605
|
+
var colspan = Math.min(
|
|
606
|
+
Number(cell.attr('colspan')), col || 1);
|
|
606
607
|
var current_width = 0;
|
|
607
608
|
for (j = 0; j < colspan; j++) {
|
|
608
609
|
current_width += widths[i + j] || 0;
|
|
@@ -630,7 +631,8 @@ function eval_pyson(value){
|
|
|
630
631
|
i = 0;
|
|
631
632
|
row.children().map(function() {
|
|
632
633
|
var cell = jQuery(this);
|
|
633
|
-
var colspan = Math.min(
|
|
634
|
+
var colspan = Math.min(
|
|
635
|
+
Number(cell.attr('colspan')), col || 1);
|
|
634
636
|
if (cell.hasClass('xexpand') &&
|
|
635
637
|
(cell.children(':not(.tooltip)').css('display') !=
|
|
636
638
|
'none')) {
|