@ons/design-system 60.0.2 → 60.0.3
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.
|
@@ -38,14 +38,7 @@
|
|
|
38
38
|
{% if td.form %}
|
|
39
39
|
<form action="{{ td.form.action }}" method="{{ td.form.method | default('POST')}}">
|
|
40
40
|
{{
|
|
41
|
-
onsButton(
|
|
42
|
-
"text": td.form.button.text,
|
|
43
|
-
"id": td.form.button.id if td.form.button.id,
|
|
44
|
-
"classes": td.form.button.classes if td.form.button.classes,
|
|
45
|
-
"url": td.form.button.url if td.form.button.url,
|
|
46
|
-
"value": td.form.button.value | safe if td.form.button.value,
|
|
47
|
-
"name": td.form.button.name if td.form.button.name
|
|
48
|
-
})
|
|
41
|
+
onsButton(td.form.button)
|
|
49
42
|
}}
|
|
50
43
|
{% if td.form.hiddenFormField %}
|
|
51
44
|
{% for hiddenField in td.form.hiddenFormField %}
|
|
@@ -356,14 +356,14 @@ describe('macro: table', () => {
|
|
|
356
356
|
|
|
357
357
|
faker.renderComponent('table', params);
|
|
358
358
|
|
|
359
|
-
expect(buttonSpy.occurrences).
|
|
359
|
+
expect(buttonSpy.occurrences).toEqual([{
|
|
360
360
|
text: 'Submit form',
|
|
361
361
|
id: 'submit-form-button',
|
|
362
362
|
classes: 'custom-button-class',
|
|
363
363
|
url: 'https://example.com/link',
|
|
364
|
-
value:
|
|
364
|
+
value: '42', // `| safe` filter is used in macro which makes a string
|
|
365
365
|
name: 'submit-form-button-name',
|
|
366
|
-
});
|
|
366
|
+
}]);
|
|
367
367
|
});
|
|
368
368
|
});
|
|
369
369
|
});
|
package/layout/_template.njk
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
{% set currentLanguageISOCode = "en" %}
|
|
6
6
|
|
|
7
|
-
{% if pageConfig and pageConfig.language and pageConfig.language.languages %}
|
|
8
|
-
{% set currentLanguage = pageConfig.language.languages | selectattr("current") | first %}
|
|
7
|
+
{% if pageConfig and pageConfig.header.language and pageConfig.header.language.languages %}
|
|
8
|
+
{% set currentLanguage = pageConfig.header.language.languages | selectattr("current") | first %}
|
|
9
9
|
{% set currentLanguageISOCode = currentLanguage.ISOCode %}
|
|
10
|
-
{% set otherLanguage = pageConfig.language.languages | rejectattr("current") | first %}
|
|
10
|
+
{% set otherLanguage = pageConfig.header.language.languages | rejectattr("current") | first %}
|
|
11
11
|
{% set otherLanguageISOCode = otherLanguage.ISOCode %}
|
|
12
12
|
{% endif %}
|
|
13
13
|
|
|
@@ -228,7 +228,6 @@
|
|
|
228
228
|
"wide": pageConfig.wide,
|
|
229
229
|
"fullWidth": pageConfig.fullWidth,
|
|
230
230
|
"classes": "ons-page__footer",
|
|
231
|
-
"language": pageConfig.language,
|
|
232
231
|
"lang": currentLanguageISOCode,
|
|
233
232
|
"rows": pageConfig.footer.rows,
|
|
234
233
|
"cols": pageConfig.footer.cols,
|