NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[REF] qweb: t-foreach: remove x_parity

Browse Source 
Part of #128
This commit is contained in:
Aaron Bohy
2019-06-07 08:52:11 +02:00
committed by Géry Debongnie
parent 1f9ec46236
commit e14a4fe338
5 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/__snapshots__/component.test.ts.snap
-1
View File
@@ -105,7 +105,6 @@ exports[`composition sub widgets with some state rendered in a loop 1`] = `
for (let i = 0; i < _length3; i++) {
context.number_first = i === 0;
context.number_last = i === _length3 - 1;
context.number_parity = i % 2 === 0 ? 'even' : 'odd';
context.number_index = i;
context.number = _3[i];
context.number_value = _4[i];
tests/__snapshots__/qweb.test.ts.snap
+1 -18
View File
@@ -324,7 +324,6 @@ exports[`foreach does not pollute the rendering context 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -353,7 +352,6 @@ exports[`foreach iterate on items (on a element node) 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -385,7 +383,6 @@ exports[`foreach iterate on items 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -426,7 +423,6 @@ exports[`foreach iterate, dict param 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -445,11 +441,6 @@ exports[`foreach iterate, dict param 1`] = `
if (_7 || _7 === 0) {
c1.push({text: _7});
}
c1.push({text: \` - \`});
var _8 = context['item_parity'];
if (_8 || _8 === 0) {
c1.push({text: _8});
}
c1.push({text: \`] \`});
}
return vn1;
@@ -472,7 +463,6 @@ exports[`foreach iterate, integer param 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -513,7 +503,6 @@ exports[`foreach iterate, position 1`] = `
for (let i = 0; i < _length3; i++) {
context.elem_first = i === 0;
context.elem_last = i === _length3 - 1;
context.elem_parity = i % 2 === 0 ? 'even' : 'odd';
context.elem_index = i;
context.elem = _3[i];
context.elem_value = _4[i];
@@ -525,7 +514,7 @@ exports[`foreach iterate, position 1`] = `
c1.push({text: \` last\`});
}
c1.push({text: \` (\`});
var _5 = context['elem_parity'];
var _5 = context['elem_index'];
if (_5 || _5 === 0) {
c1.push({text: _5});
}
@@ -551,7 +540,6 @@ exports[`foreach warn if no key in some case 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -612,7 +600,6 @@ exports[`misc global 1`] = `
for (let i = 0; i < _length3; i++) {
context.value_first = i === 0;
context.value_last = i === _length3 - 1;
context.value_parity = i % 2 === 0 ? 'even' : 'odd';
context.value_index = i;
context.value = _3[i];
context.value_value = _4[i];
@@ -1122,7 +1109,6 @@ exports[`t-key t-key directive in a list 1`] = `
for (let i = 0; i < _length3; i++) {
context.beer_first = i === 0;
context.beer_last = i === _length3 - 1;
context.beer_parity = i % 2 === 0 ? 'even' : 'odd';
context.beer_index = i;
context.beer = _3[i];
context.beer_value = _4[i];
@@ -1222,7 +1208,6 @@ exports[`t-on can bind handlers with loop variable as argument 1`] = `
for (let i = 0; i < _length3; i++) {
context.action_first = i === 0;
context.action_last = i === _length3 - 1;
context.action_parity = i % 2 === 0 ? 'even' : 'odd';
context.action_index = i;
context.action = _3[i];
context.action_value = _4[i];
@@ -1550,7 +1535,6 @@ exports[`t-ref refs in a loop 1`] = `
for (let i = 0; i < _length3; i++) {
context.item_first = i === 0;
context.item_last = i === _length3 - 1;
context.item_parity = i % 2 === 0 ? 'even' : 'odd';
context.item_index = i;
context.item = _3[i];
context.item_value = _4[i];
@@ -1709,7 +1693,6 @@ exports[`t-set t-set should reuse variable if possible 1`] = `
for (let i = 0; i < _length4; i++) {
context.elem_first = i === 0;
context.elem_last = i === _length4 - 1;
context.elem_parity = i % 2 === 0 ? 'even' : 'odd';
context.elem_index = i;
context.elem = _4[i];
context.elem_value = _5[i];
tests/qweb.test.ts
+4 -4
View File
@@ -658,12 +658,12 @@ describe("foreach", () => {
`
<div>
<t t-foreach="5" t-as="elem">
-<t t-if="elem_first"> first</t><t t-if="elem_last"> last</t> (<t t-esc="elem_parity"/>)
-<t t-if="elem_first"> first</t><t t-if="elem_last"> last</t> (<t t-esc="elem_index"/>)
</t>
</div>`
);
const result = trim(renderToString(qweb, "test"));
const expected = `<div>-first(even)-(odd)-(even)-(odd)-last(even)</div>`;
const expected = `<div>-first(0)-(1)-(2)-(3)-last(4)</div>`;
expect(result).toBe(expected);
});
@@ -685,14 +685,14 @@ describe("foreach", () => {
`
<div>
<t t-foreach="value" t-as="item">
[<t t-esc="item_index"/>: <t t-esc="item"/> <t t-esc="item_value"/> - <t t-esc="item_parity"/>]
[<t t-esc="item_index"/>: <t t-esc="item"/> <t t-esc="item_value"/>]
</t>
</div>`
);
const result = trim(
renderToString(qweb, "test", { value: { a: 1, b: 2, c: 3 } })
);
const expected = `<div>[0:a1-even][1:b2-odd][2:c3-even]</div>`;
const expected = `<div>[0:a1][1:b2][2:c3]</div>`;
expect(result).toBe(expected);
});