@ons/design-system 61.0.3 → 62.0.0
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/components/header/_macro.njk +7 -7
- package/components/modal/_macro.njk +0 -1
- package/components/modal/modal.js +0 -28
- package/components/modal/modal.spec.js +0 -63
- package/components/related-content/_macro.njk +26 -30
- package/components/related-content/_macro.spec.js +1 -1
- package/components/table/_macro.njk +1 -1
- package/components/table/sortable-table.js +2 -2
- package/components/tabs/_macro.njk +2 -2
- package/components/tabs/_tabs.scss +2 -2
- package/components/timeout-modal/_macro.njk +0 -1
- package/components/timeout-modal/timeout-modal.spec.js +0 -83
- package/components/video/_video.scss +5 -3
- package/components/video/video.js +1 -0
- package/components/video/video.spec.js +10 -0
- package/css/main.css +1 -1
- package/js/timeout.js +0 -7
- package/layout/_template.njk +22 -44
- package/package.json +1 -1
- package/scripts/main.es5.js +1 -1
- package/scripts/main.js +2 -2
package/js/timeout.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import initAnalytics from './analytics';
|
|
2
1
|
export default class Timeout {
|
|
3
2
|
constructor(context, sessionExpiryEndpoint, initialExpiryTime, enableTimeoutReset, startOnLoad) {
|
|
4
3
|
this.context = context;
|
|
@@ -9,7 +8,6 @@ export default class Timeout {
|
|
|
9
8
|
this.countdown = context.querySelector('.ons-js-timeout-timer');
|
|
10
9
|
this.accessibleCountdown = context.querySelector('.ons-js-timeout-timer-acc');
|
|
11
10
|
this.timeOutRedirectUrl = context.getAttribute('data-redirect-url');
|
|
12
|
-
this.setGAAttributes = context.getAttribute('data-enable-ga');
|
|
13
11
|
|
|
14
12
|
// Language dependent text strings
|
|
15
13
|
this.minutesTextSingular = context.getAttribute('data-minutes-text-singular');
|
|
@@ -81,11 +79,6 @@ export default class Timeout {
|
|
|
81
79
|
if (timerExpired) {
|
|
82
80
|
$this.countdown.innerHTML = '<span class="ons-u-fw-b">' + $this.countdownExpiredText + '</span>';
|
|
83
81
|
$this.accessibleCountdown.innerHTML = $this.countdownExpiredText;
|
|
84
|
-
if ($this.setGAAttributes && $this.context.classList.contains('ons-modal')) {
|
|
85
|
-
$this.context.setAttribute('data-ga-action', 'Modal closed by timed event');
|
|
86
|
-
$this.context.setAttribute('data-ga-label', `Timeout modal closed`);
|
|
87
|
-
initAnalytics();
|
|
88
|
-
}
|
|
89
82
|
setTimeout($this.redirect.bind($this), 2000);
|
|
90
83
|
} else {
|
|
91
84
|
seconds--;
|
package/layout/_template.njk
CHANGED
|
@@ -47,19 +47,9 @@
|
|
|
47
47
|
{% endif %}
|
|
48
48
|
|
|
49
49
|
{# Page columns #}
|
|
50
|
-
{% set
|
|
51
|
-
|
|
52
|
-
{% if pageConfig.
|
|
53
|
-
{% set mainColNumber = pageConfig.mainCol.columns if pageConfig.mainCol.columns %}
|
|
54
|
-
{% set mainColClasses = (' ' + pageConfig.mainCol.colClasses) if pageConfig.mainCol.colClasses %}
|
|
55
|
-
{% set mainClasses = (' ' + pageConfig.mainCol.classes) if pageConfig.mainCol.classes %}
|
|
56
|
-
{% endif %}
|
|
57
|
-
|
|
58
|
-
{% if pageConfig.asideCol %}
|
|
59
|
-
{% set asideColNumber = 12 - mainColNumber if pageConfig.asideCol.position %}
|
|
60
|
-
{% set asideColClasses = (' ' + pageConfig.asideCol.colClasses) if pageConfig.asideCol.colClasses %}
|
|
61
|
-
{% set asideClasses = (' ' + pageConfig.asideCol.classes) if pageConfig.asideCol.classes %}
|
|
62
|
-
{% endif %}
|
|
50
|
+
{% set pageColNumber = pageConfig.pageColNumber | default("12") %}
|
|
51
|
+
{% set pageColClasses = pageConfig.pageColClasses if pageConfig.pageColClasses else '' %}
|
|
52
|
+
{% set mainClasses = pageConfig.mainColClasses if pageConfig.mainColClasses else '' %}
|
|
63
53
|
|
|
64
54
|
<!doctype html>
|
|
65
55
|
<html lang="{{ currentLanguageISOCode }}">
|
|
@@ -106,13 +96,15 @@
|
|
|
106
96
|
{% endif %}
|
|
107
97
|
|
|
108
98
|
{% if pageConfig.social %}
|
|
99
|
+
|
|
100
|
+
{% set twitterImagePath = pageConfig.social.twitterImage if pageConfig.social.twitterImage else assetsURL + '/favicons/twitter.png' %}
|
|
109
101
|
<!-- Twitter -->
|
|
110
102
|
<meta name="twitter:card" content="summary">
|
|
111
103
|
<meta name="twitter:site" content="{{ pageConfig.social.twitterSite }}">
|
|
112
|
-
<meta name="twitter:url" content="{{ pageConfig.
|
|
104
|
+
<meta name="twitter:url" content="{{ pageConfig.meta.canonicalUrl | default(pageConfig.absoluteUrl) }}">
|
|
113
105
|
<meta name="twitter:title" content="{{ pageConfig.social.title | default(pageConfig.title) }}">
|
|
114
106
|
<meta name="twitter:description" content="{{ pageConfig.social.description | default(pageConfig.description) }}">
|
|
115
|
-
<meta name="twitter:image" content="{{
|
|
107
|
+
<meta name="twitter:image" content="{{ twitterImagePath }}">
|
|
116
108
|
{% endif %}
|
|
117
109
|
{% endblock %}
|
|
118
110
|
|
|
@@ -179,38 +171,24 @@
|
|
|
179
171
|
{% endblock %}
|
|
180
172
|
{% block pageContent %}
|
|
181
173
|
<div class="ons-page__container ons-container{{ containerClasses }}">
|
|
182
|
-
{%
|
|
183
|
-
{%
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
{% block preMain %}{% endblock %}
|
|
193
|
-
<div class="ons-grid">
|
|
194
|
-
{% if pageConfig.asideCol %}
|
|
195
|
-
{% set aside %}
|
|
196
|
-
<div class="ons-grid__col ons-col-{{ asideColNumber }}@m{{ asideColClasses }}">
|
|
197
|
-
<aside {% if pageConfig.asideCol.id %}id="{{ asideId }}" {% endif %}class="ons-page__aside{{ asideClasses }}">
|
|
198
|
-
{% block aside %}{% endblock %}
|
|
199
|
-
</aside>
|
|
200
|
-
</div>
|
|
201
|
-
{% endset %}
|
|
202
|
-
{% endif %}
|
|
203
|
-
{% if pageConfig.asideCol and pageConfig.asideCol.position == "before" %}
|
|
204
|
-
{{ aside | safe }}
|
|
174
|
+
{% block preMain %}
|
|
175
|
+
{% if pageConfig.breadcrumbs %}
|
|
176
|
+
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
|
|
177
|
+
{{
|
|
178
|
+
onsBreadcrumbs({
|
|
179
|
+
"id": pageConfig.breadcrumbs.id,
|
|
180
|
+
"ariaLabel": pageConfig.breadcrumbs.ariaLabel,
|
|
181
|
+
"itemsList": pageConfig.breadcrumbs.itemsList
|
|
182
|
+
})
|
|
183
|
+
}}
|
|
205
184
|
{% endif %}
|
|
206
|
-
|
|
207
|
-
|
|
185
|
+
{% endblock %}
|
|
186
|
+
<div class="ons-grid">
|
|
187
|
+
<div class="ons-grid__col ons-col-{{ pageColNumber }}@m {{ pageColClasses }}">
|
|
188
|
+
<main id="main-content" class="ons-page__main {{ mainColClasses }}">
|
|
208
189
|
{% block main %}{% endblock %}
|
|
209
190
|
</main>
|
|
210
191
|
</div>
|
|
211
|
-
{% if pageConfig.asideCol and pageConfig.asideCol.position == "after" %}
|
|
212
|
-
{{ aside | safe }}
|
|
213
|
-
{% endif %}
|
|
214
192
|
</div>
|
|
215
193
|
</div>
|
|
216
194
|
{% endblock %}
|
|
@@ -234,7 +212,7 @@
|
|
|
234
212
|
"poweredBy": pageConfig.footer.poweredBy,
|
|
235
213
|
"crest": pageConfig.footer.crest,
|
|
236
214
|
"OGLLink": pageConfig.footer.OGLLink,
|
|
237
|
-
"button": pageConfig.signoutButton,
|
|
215
|
+
"button": pageConfig.header.signoutButton,
|
|
238
216
|
"footerWarning": pageConfig.footer.footerWarning,
|
|
239
217
|
"copyrightDeclaration": pageConfig.footer.copyrightDeclaration,
|
|
240
218
|
"newTabWarning": pageConfig.footer.newTabWarning,
|