tryton-sao 6.2.11 → 6.2.12
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.css +3 -2
- package/dist/tryton-sao.js +9 -6
- package/dist/tryton-sao.min.css +3 -2
- package/dist/tryton-sao.min.js +2 -2
- package/package.json +1 -1
- package/src/common.js +3 -2
- package/src/sao.less +2 -3
- package/src/view/form.js +6 -4
package/CHANGELOG
CHANGED
package/dist/tryton-sao.css
CHANGED
|
@@ -9164,9 +9164,10 @@ html[theme="default"] .carousel-caption h6 {
|
|
|
9164
9164
|
content: "";
|
|
9165
9165
|
background-color: rgba(0, 0, 0, 0);
|
|
9166
9166
|
}
|
|
9167
|
-
|
|
9168
|
-
overflow
|
|
9167
|
+
.btn-horizontal {
|
|
9168
|
+
overflow: hidden;
|
|
9169
9169
|
text-overflow: ellipsis;
|
|
9170
|
+
white-space: nowrap;
|
|
9170
9171
|
}
|
|
9171
9172
|
.input-group > .form-control-feedback {
|
|
9172
9173
|
z-index: 3;
|
package/dist/tryton-sao.js
CHANGED
|
@@ -3794,8 +3794,9 @@ var Sao = {};
|
|
|
3794
3794
|
}).prependTo(this.el);
|
|
3795
3795
|
this.icon.hide();
|
|
3796
3796
|
}
|
|
3797
|
-
this.el.addClass(
|
|
3798
|
-
|
|
3797
|
+
this.el.addClass([
|
|
3798
|
+
'btn', 'btn-horizontal',
|
|
3799
|
+
(style || 'btn-default'), (size || '')].join(' '));
|
|
3799
3800
|
this.el.attr('type', 'button');
|
|
3800
3801
|
this.icon.attr('aria-hidden', true);
|
|
3801
3802
|
this.set_icon(attributes.icon);
|
|
@@ -14688,7 +14689,7 @@ function eval_pyson(value){
|
|
|
14688
14689
|
i = 0;
|
|
14689
14690
|
row.children().map(function() {
|
|
14690
14691
|
var cell = jQuery(this);
|
|
14691
|
-
var colspan = Math.min(Number(cell.attr('colspan')), col);
|
|
14692
|
+
var colspan = Math.min(Number(cell.attr('colspan')), col || 1);
|
|
14692
14693
|
if (cell.hasClass('xexpand') &&
|
|
14693
14694
|
(!jQuery.isEmptyObject(cell.children())) &&
|
|
14694
14695
|
(cell.children(':not(.tooltip)').css('display') != 'none')) {
|
|
@@ -14708,7 +14709,7 @@ function eval_pyson(value){
|
|
|
14708
14709
|
var reduce = function(previous, current) {
|
|
14709
14710
|
var cell = current[0];
|
|
14710
14711
|
var colspan = Math.min(
|
|
14711
|
-
Number(cell.attr('colspan')), col);
|
|
14712
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14712
14713
|
return previous + colspan;
|
|
14713
14714
|
};
|
|
14714
14715
|
return a.reduce(reduce, 0) - b.reduce(reduce, 0);
|
|
@@ -14723,7 +14724,8 @@ function eval_pyson(value){
|
|
|
14723
14724
|
xexpands.forEach(function(e) {
|
|
14724
14725
|
var cell = e[0];
|
|
14725
14726
|
i = e[1];
|
|
14726
|
-
var colspan = Math.min(
|
|
14727
|
+
var colspan = Math.min(
|
|
14728
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14727
14729
|
var current_width = 0;
|
|
14728
14730
|
for (j = 0; j < colspan; j++) {
|
|
14729
14731
|
current_width += widths[i + j] || 0;
|
|
@@ -14751,7 +14753,8 @@ function eval_pyson(value){
|
|
|
14751
14753
|
i = 0;
|
|
14752
14754
|
row.children().map(function() {
|
|
14753
14755
|
var cell = jQuery(this);
|
|
14754
|
-
var colspan = Math.min(
|
|
14756
|
+
var colspan = Math.min(
|
|
14757
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14755
14758
|
if (cell.hasClass('xexpand') &&
|
|
14756
14759
|
(cell.children(':not(.tooltip)').css('display') !=
|
|
14757
14760
|
'none')) {
|
package/dist/tryton-sao.min.css
CHANGED
|
@@ -9164,9 +9164,10 @@ html[theme="default"] .carousel-caption h6 {
|
|
|
9164
9164
|
content: "";
|
|
9165
9165
|
background-color: rgba(0, 0, 0, 0);
|
|
9166
9166
|
}
|
|
9167
|
-
|
|
9168
|
-
overflow
|
|
9167
|
+
.btn-horizontal {
|
|
9168
|
+
overflow: hidden;
|
|
9169
9169
|
text-overflow: ellipsis;
|
|
9170
|
+
white-space: nowrap;
|
|
9170
9171
|
}
|
|
9171
9172
|
.input-group > .form-control-feedback {
|
|
9172
9173
|
z-index: 3;
|