govuk_publishing_components 21.59.0 → 21.61.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +31 -6
- data/app/assets/javascripts/component_guide/accessibility-test.js +21 -21
- data/app/assets/javascripts/component_guide/filter-components.js +19 -19
- data/app/assets/javascripts/component_guide/visual-regression.js +38 -37
- data/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js +102 -73
- data/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js +4 -4
- data/app/assets/javascripts/govuk_publishing_components/ie.js +2 -0
- data/app/assets/javascripts/govuk_publishing_components/lib/auto-track-event.js +31 -0
- data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js +24 -24
- data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js +17 -17
- data/app/assets/javascripts/govuk_publishing_components/vendor/html5shiv-printshiv.js +4 -0
- data/app/assets/javascripts/govuk_publishing_components/vendor/json2.js +487 -0
- data/app/assets/stylesheets/component_guide/application.scss +19 -15
- data/app/assets/stylesheets/govuk_publishing_components/_all_components.scss +1 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_action-link.scss +0 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/_breadcrumbs.scss +1 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_checkboxes.scss +4 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss +1 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss +0 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_govspeak-html-publication.scss +4 -5
- data/app/assets/stylesheets/govuk_publishing_components/components/_heading.scss +3 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/_image-card.scss +1 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_input.scss +1 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_inverse-header.scss +5 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/_layout-footer.scss +8 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss +4 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_layout-header.scss +87 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_radio.scss +4 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/_related-navigation.scss +2 -2
- data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss +46 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-header.scss +0 -5
- data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav-related.scss +1 -4
- data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss +8 -12
- data/app/assets/stylesheets/govuk_publishing_components/components/_table.scss +21 -24
- data/app/assets/stylesheets/govuk_publishing_components/components/_tabs.scss +4 -8
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_attachment.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_button.scss +1 -4
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss +6 -6
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_contact.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_footnotes.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_highlight-answer.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_place.scss +1 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/helpers/_markdown-typography.scss +1 -1
- data/app/assets/stylesheets/govuk_publishing_components/components/print/_govspeak.scss +2 -0
- data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav-header.scss +0 -4
- data/app/assets/stylesheets/govuk_publishing_components/components/print/_step-by-step-nav.scss +2 -10
- data/app/controllers/govuk_publishing_components/audit_controller.rb +2 -2
- data/app/controllers/govuk_publishing_components/component_guide_controller.rb +2 -2
- data/app/models/govuk_publishing_components/audit_applications.rb +45 -27
- data/app/models/govuk_publishing_components/audit_comparer.rb +77 -51
- data/app/models/govuk_publishing_components/audit_components.rb +25 -6
- data/app/models/govuk_publishing_components/component_example.rb +4 -0
- data/app/views/govuk_publishing_components/audit/show.html.erb +227 -190
- data/app/views/govuk_publishing_components/component_guide/component_doc/_component.html.erb +1 -0
- data/app/views/govuk_publishing_components/component_guide/index.html.erb +3 -1
- data/app/views/govuk_publishing_components/components/_breadcrumbs.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_image_card.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_layout_footer.html.erb +32 -21
- data/app/views/govuk_publishing_components/components/_layout_for_public.html.erb +76 -0
- data/app/views/govuk_publishing_components/components/_layout_header.html.erb +39 -51
- data/app/views/govuk_publishing_components/components/_machine_readable_metadata.html.erb +1 -1
- data/app/views/govuk_publishing_components/components/_radio.html.erb +13 -5
- data/app/views/govuk_publishing_components/components/_search.html.erb +10 -5
- data/app/views/govuk_publishing_components/components/_share_links.html.erb +9 -9
- data/app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb +2 -2
- data/app/views/govuk_publishing_components/components/docs/checkboxes.yml +4 -0
- data/app/views/govuk_publishing_components/components/docs/govspeak.yml +45 -0
- data/app/views/govuk_publishing_components/components/docs/heading.yml +6 -3
- data/app/views/govuk_publishing_components/components/docs/image_card.yml +13 -1
- data/app/views/govuk_publishing_components/components/docs/layout_footer.yml +17 -0
- data/app/views/govuk_publishing_components/components/docs/layout_for_admin.yml +5 -1
- data/app/views/govuk_publishing_components/components/docs/layout_for_public.yml +29 -0
- data/app/views/govuk_publishing_components/components/docs/layout_header.yml +34 -0
- data/app/views/govuk_publishing_components/components/docs/radio.yml +4 -0
- data/app/views/govuk_publishing_components/components/docs/search.yml +6 -0
- data/app/views/govuk_publishing_components/components/layout_header/_header_logo.html.erb +23 -0
- data/app/views/govuk_publishing_components/components/layout_header/_navigation_items.html.erb +17 -0
- data/app/views/govuk_publishing_components/components/layout_header/_search.html.erb +9 -0
- data/config/initializers/assets.rb +8 -0
- data/lib/govuk_publishing_components.rb +1 -0
- data/lib/govuk_publishing_components/presenters/checkboxes_helper.rb +15 -7
- data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb +1 -0
- data/lib/govuk_publishing_components/presenters/heading_helper.rb +21 -1
- data/lib/govuk_publishing_components/presenters/image_card_helper.rb +3 -2
- data/lib/govuk_publishing_components/presenters/public_layout_helper.rb +380 -0
- data/lib/govuk_publishing_components/version.rb +1 -1
- data/node_modules/axe-core/package.json +145 -220
- data/node_modules/govuk-frontend/govuk/all.js +160 -57
- data/node_modules/govuk-frontend/govuk/components/character-count/_index.scss +0 -4
- data/node_modules/govuk-frontend/govuk/components/character-count/character-count.js +16 -8
- data/node_modules/govuk-frontend/govuk/components/character-count/macro-options.json +6 -0
- data/node_modules/govuk-frontend/govuk/components/character-count/template.njk +1 -0
- data/node_modules/govuk-frontend/govuk/components/checkboxes/_index.scss +6 -5
- data/node_modules/govuk-frontend/govuk/components/checkboxes/checkboxes.js +68 -21
- data/node_modules/govuk-frontend/govuk/components/date-input/macro-options.json +1 -1
- data/node_modules/govuk-frontend/govuk/components/file-upload/_index.scss +0 -27
- data/node_modules/govuk-frontend/govuk/components/footer/_index.scss +0 -3
- data/node_modules/govuk-frontend/govuk/components/footer/template.njk +1 -1
- data/node_modules/govuk-frontend/govuk/components/header/template.njk +1 -1
- data/node_modules/govuk-frontend/govuk/components/hint/_index.scss +2 -2
- data/node_modules/govuk-frontend/govuk/components/hint/template.njk +2 -2
- data/node_modules/govuk-frontend/govuk/components/input/_index.scss +0 -3
- data/node_modules/govuk-frontend/govuk/components/input/macro-options.json +6 -0
- data/node_modules/govuk-frontend/govuk/components/input/template.njk +1 -0
- data/node_modules/govuk-frontend/govuk/components/radios/radios.js +76 -28
- data/node_modules/govuk-frontend/govuk/components/select/_index.scss +0 -3
- data/node_modules/govuk-frontend/govuk/components/skip-link/_index.scss +1 -0
- data/node_modules/govuk-frontend/govuk/components/textarea/_index.scss +0 -3
- data/node_modules/govuk-frontend/govuk/components/textarea/macro-options.json +6 -0
- data/node_modules/govuk-frontend/govuk/components/textarea/template.njk +1 -0
- data/node_modules/govuk-frontend/govuk/components/warning-text/_index.scss +4 -2
- data/node_modules/govuk-frontend/govuk/helpers/_colour.scss +1 -1
- data/node_modules/govuk-frontend/govuk/settings/_colours-applied.scss +2 -2
- data/node_modules/govuk-frontend/govuk/settings/_colours-palette.scss +33 -33
- data/node_modules/govuk-frontend/govuk/settings/_measurements.scss +4 -1
- data/node_modules/govuk-frontend/package.json +14 -81
- data/node_modules/jquery/package.json +44 -116
- metadata +34 -66
- data/Rakefile +0 -37
@@ -405,7 +405,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
405
405
|
var dimension28 = $(event.target).closest('.gem-c-step-nav__list').attr('data-length')
|
406
406
|
|
407
407
|
if (dimension28) {
|
408
|
-
trackingOptions
|
408
|
+
trackingOptions.dimension28 = dimension28
|
409
409
|
}
|
410
410
|
|
411
411
|
stepNavTracker.track('stepNavLinkClicked', linkPosition, trackingOptions)
|
@@ -421,9 +421,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
|
|
421
421
|
// dimension28 records the number of links in the step that was shown/hidden (handled in click event)
|
422
422
|
if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
|
423
423
|
options = options || {}
|
424
|
-
options
|
425
|
-
options
|
426
|
-
options
|
424
|
+
options.dimension26 = options.dimension26 || totalSteps.toString()
|
425
|
+
options.dimension27 = options.dimension27 || totalLinks.toString()
|
426
|
+
options.dimension96 = options.dimension96 || uniqueId
|
427
427
|
window.GOVUK.analytics.trackEvent(category, action, options)
|
428
428
|
}
|
429
429
|
}
|
@@ -0,0 +1,31 @@
|
|
1
|
+
// migrated from govuk_frontend_toolkit
|
2
|
+
;(function (global) {
|
3
|
+
'use strict'
|
4
|
+
|
5
|
+
var GOVUK = global.GOVUK || {}
|
6
|
+
GOVUK.Modules = GOVUK.Modules || {}
|
7
|
+
|
8
|
+
GOVUK.Modules.AutoTrackEvent = function () {
|
9
|
+
this.start = function (element) {
|
10
|
+
var options = { nonInteraction: 1 } // automatic events shouldn't affect bounce rate
|
11
|
+
var category = element.data('track-category')
|
12
|
+
var action = element.data('track-action')
|
13
|
+
var label = element.data('track-label')
|
14
|
+
var value = element.data('track-value')
|
15
|
+
|
16
|
+
if (typeof label === 'string') {
|
17
|
+
options.label = label
|
18
|
+
}
|
19
|
+
|
20
|
+
if (value || value === 0) {
|
21
|
+
options.value = value
|
22
|
+
}
|
23
|
+
|
24
|
+
if (GOVUK.analytics && GOVUK.analytics.trackEvent) {
|
25
|
+
GOVUK.analytics.trackEvent(category, action, options)
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
29
|
+
|
30
|
+
global.GOVUK = GOVUK
|
31
|
+
})(window)
|
@@ -5,31 +5,31 @@
|
|
5
5
|
window.GOVUK = window.GOVUK || {}
|
6
6
|
|
7
7
|
var DEFAULT_COOKIE_CONSENT = {
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
essential: true,
|
9
|
+
settings: false,
|
10
|
+
usage: false,
|
11
|
+
campaigns: false
|
12
12
|
}
|
13
13
|
|
14
14
|
var COOKIE_CATEGORIES = {
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
15
|
+
cookies_policy: 'essential',
|
16
|
+
seen_cookie_message: 'essential',
|
17
|
+
cookie_preferences_set: 'essential',
|
18
|
+
cookies_preferences_set: 'essential',
|
19
19
|
'_email-alert-frontend_session': 'essential',
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
20
|
+
licensing_session: 'essential',
|
21
|
+
govuk_contact_referrer: 'essential',
|
22
|
+
multivariatetest_cohort_coronavirus_extremely_vulnerable_rate_limit: 'essential',
|
23
|
+
dgu_beta_banner_dismissed: 'settings',
|
24
|
+
global_bar_seen: 'settings',
|
25
|
+
govuk_browser_upgrade_dismisssed: 'settings',
|
26
|
+
govuk_not_first_visit: 'settings',
|
27
|
+
analytics_next_page_call: 'usage',
|
28
|
+
_ga: 'usage',
|
29
|
+
_gid: 'usage',
|
30
|
+
_gat: 'usage',
|
31
31
|
'JS-Detection': 'usage',
|
32
|
-
|
32
|
+
TLSversion: 'usage'
|
33
33
|
}
|
34
34
|
|
35
35
|
/*
|
@@ -69,10 +69,10 @@
|
|
69
69
|
|
70
70
|
window.GOVUK.approveAllCookieTypes = function () {
|
71
71
|
var approvedConsent = {
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
72
|
+
essential: true,
|
73
|
+
settings: true,
|
74
|
+
usage: true,
|
75
|
+
campaigns: true
|
76
76
|
}
|
77
77
|
|
78
78
|
window.GOVUK.setCookie('cookies_policy', JSON.stringify(approvedConsent), { days: 365 })
|
data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/youtube-link-enhancement.js
CHANGED
@@ -21,7 +21,7 @@
|
|
21
21
|
for (var i = 0; i < $youtubeLinks.length; ++i) {
|
22
22
|
var $link = $youtubeLinks[i]
|
23
23
|
var href = $link.getAttribute('href')
|
24
|
-
var hasTracking = $link.
|
24
|
+
var hasTracking = $link.hasAttribute('data-youtube-player-analytics')
|
25
25
|
var options = {
|
26
26
|
link: $link
|
27
27
|
}
|
@@ -33,7 +33,7 @@
|
|
33
33
|
}
|
34
34
|
}
|
35
35
|
|
36
|
-
if (href.
|
36
|
+
if (href.indexOf('/live_stream') >= 0) {
|
37
37
|
var channelId = YoutubeLinkEnhancement.parseLivestream(href)
|
38
38
|
|
39
39
|
if (!this.hasDisabledEmbed($link) && channelId) {
|
@@ -67,19 +67,19 @@
|
|
67
67
|
youtubeVideoContainer.className += 'gem-c-govspeak__youtube-video'
|
68
68
|
youtubeVideoContainer.innerHTML = '<span id="' + elementId + '" data-video-id="' + id + '"></span>'
|
69
69
|
|
70
|
-
options
|
70
|
+
options.title = $link.textContent
|
71
71
|
|
72
72
|
parentContainer.replaceChild(youtubeVideoContainer, parentPara)
|
73
73
|
this.insertVideo(elementId, options)
|
74
74
|
}
|
75
75
|
|
76
76
|
YoutubeLinkEnhancement.prototype.insertVideo = function (elementId, options) {
|
77
|
-
var channelId =
|
78
|
-
var videoId =
|
77
|
+
var channelId = ''
|
78
|
+
var videoId = ''
|
79
79
|
|
80
80
|
if (options.channel) {
|
81
81
|
channelId = options.channel
|
82
|
-
videoId =
|
82
|
+
videoId = 'live_stream'
|
83
83
|
} else {
|
84
84
|
videoId = options.videoId
|
85
85
|
}
|
@@ -112,16 +112,17 @@
|
|
112
112
|
var eventData = event.data
|
113
113
|
var eventTarget = event.target
|
114
114
|
var states = {
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
115
|
+
/* eslint-disable quote-props */
|
116
|
+
'-1': 'VideoUnstarted',
|
117
|
+
'0': 'VideoEnded',
|
118
|
+
'1': 'VideoPlaying',
|
119
|
+
'2': 'VideoPaused',
|
120
|
+
'3': 'VideoBuffering',
|
121
|
+
'5': 'VideoCued'
|
122
|
+
/* eslint-enable */
|
121
123
|
}
|
122
|
-
if (states[eventData] && options.tracking && options.tracking.hasTracking
|
123
|
-
|
124
|
-
{
|
124
|
+
if (states[eventData] && options.tracking && options.tracking.hasTracking &&
|
125
|
+
window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
|
125
126
|
var tracking = {
|
126
127
|
category: options.tracking.category,
|
127
128
|
action: states[eventData],
|
@@ -192,8 +193,7 @@
|
|
192
193
|
params[part[0]] = part[1]
|
193
194
|
}
|
194
195
|
return params.v
|
195
|
-
}
|
196
|
-
else if (url.indexOf('youtu.be') > -1) {
|
196
|
+
} else if (url.indexOf('youtu.be') > -1) {
|
197
197
|
parts = url.split('/')
|
198
198
|
return parts.pop()
|
199
199
|
}
|
@@ -0,0 +1,4 @@
|
|
1
|
+
/**
|
2
|
+
* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
|
3
|
+
*/
|
4
|
+
!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=y.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=y.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),y.elements=c+" "+a,j(b)}function f(a){var b=x[a[v]];return b||(b={},w++,a[v]=w,x[w]=b),b}function g(a,c,d){if(c||(c=b),q)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():u.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||t.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),q)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return y.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(y,b.frag)}function j(a){a||(a=b);var d=f(a);return!y.shivCSS||p||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),q||i(a,d),a}function k(a){for(var b,c=a.getElementsByTagName("*"),e=c.length,f=RegExp("^(?:"+d().join("|")+")$","i"),g=[];e--;)b=c[e],f.test(b.nodeName)&&g.push(b.applyElement(l(b)));return g}function l(a){for(var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(A+":"+a.nodeName);d--;)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function m(a){for(var b,c=a.split("{"),e=c.length,f=RegExp("(^|[\\s,>+~])("+d().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),g="$1"+A+"\\:$2";e--;)b=c[e]=c[e].split("}"),b[b.length-1]=b[b.length-1].replace(f,g),c[e]=b.join("}");return c.join("{")}function n(a){for(var b=a.length;b--;)a[b].removeNode()}function o(a){function b(){clearTimeout(g._removeSheetTimer),d&&d.removeNode(!0),d=null}var d,e,g=f(a),h=a.namespaces,i=a.parentWindow;return!B||a.printShived?a:("undefined"==typeof h[A]&&h.add(A),i.attachEvent("onbeforeprint",function(){b();for(var f,g,h,i=a.styleSheets,j=[],l=i.length,n=Array(l);l--;)n[l]=i[l];for(;h=n.pop();)if(!h.disabled&&z.test(h.media)){try{f=h.imports,g=f.length}catch(o){g=0}for(l=0;g>l;l++)n.push(f[l]);try{j.push(h.cssText)}catch(o){}}j=m(j.reverse().join("")),e=k(a),d=c(a,j)}),i.attachEvent("onafterprint",function(){n(e),clearTimeout(g._removeSheetTimer),g._removeSheetTimer=setTimeout(b,500)}),a.printShived=!0,a)}var p,q,r="3.7.3",s=a.html5||{},t=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,u=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,v="_html5shiv",w=0,x={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",p="hidden"in a,q=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){p=!0,q=!0}}();var y={elements:s.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:r,shivCSS:s.shivCSS!==!1,supportsUnknownElements:q,shivMethods:s.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=y,j(b);var z=/^$|\b(?:all|print)\b/,A="html5shiv",B=!q&&function(){var c=b.documentElement;return!("undefined"==typeof b.namespaces||"undefined"==typeof b.parentWindow||"undefined"==typeof c.applyElement||"undefined"==typeof c.removeNode||"undefined"==typeof a.attachEvent)}();y.type+=" print",y.shivPrint=o,o(b),"object"==typeof module&&module.exports&&(module.exports=y)}("undefined"!=typeof window?window:this,document);
|
@@ -0,0 +1,487 @@
|
|
1
|
+
/*
|
2
|
+
json2.js
|
3
|
+
2011-10-19
|
4
|
+
|
5
|
+
Public Domain.
|
6
|
+
|
7
|
+
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
|
8
|
+
|
9
|
+
See http://www.JSON.org/js.html
|
10
|
+
|
11
|
+
|
12
|
+
This code should be minified before deployment.
|
13
|
+
See http://javascript.crockford.com/jsmin.html
|
14
|
+
|
15
|
+
USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
|
16
|
+
NOT CONTROL.
|
17
|
+
|
18
|
+
|
19
|
+
This file creates a global JSON object containing two methods: stringify
|
20
|
+
and parse.
|
21
|
+
|
22
|
+
JSON.stringify(value, replacer, space)
|
23
|
+
value any JavaScript value, usually an object or array.
|
24
|
+
|
25
|
+
replacer an optional parameter that determines how object
|
26
|
+
values are stringified for objects. It can be a
|
27
|
+
function or an array of strings.
|
28
|
+
|
29
|
+
space an optional parameter that specifies the indentation
|
30
|
+
of nested structures. If it is omitted, the text will
|
31
|
+
be packed without extra whitespace. If it is a number,
|
32
|
+
it will specify the number of spaces to indent at each
|
33
|
+
level. If it is a string (such as '\t' or ' '),
|
34
|
+
it contains the characters used to indent at each level.
|
35
|
+
|
36
|
+
This method produces a JSON text from a JavaScript value.
|
37
|
+
|
38
|
+
When an object value is found, if the object contains a toJSON
|
39
|
+
method, its toJSON method will be called and the result will be
|
40
|
+
stringified. A toJSON method does not serialize: it returns the
|
41
|
+
value represented by the name/value pair that should be serialized,
|
42
|
+
or undefined if nothing should be serialized. The toJSON method
|
43
|
+
will be passed the key associated with the value, and this will be
|
44
|
+
bound to the value
|
45
|
+
|
46
|
+
For example, this would serialize Dates as ISO strings.
|
47
|
+
|
48
|
+
Date.prototype.toJSON = function (key) {
|
49
|
+
function f(n) {
|
50
|
+
// Format integers to have at least two digits.
|
51
|
+
return n < 10 ? '0' + n : n;
|
52
|
+
}
|
53
|
+
|
54
|
+
return this.getUTCFullYear() + '-' +
|
55
|
+
f(this.getUTCMonth() + 1) + '-' +
|
56
|
+
f(this.getUTCDate()) + 'T' +
|
57
|
+
f(this.getUTCHours()) + ':' +
|
58
|
+
f(this.getUTCMinutes()) + ':' +
|
59
|
+
f(this.getUTCSeconds()) + 'Z';
|
60
|
+
};
|
61
|
+
|
62
|
+
You can provide an optional replacer method. It will be passed the
|
63
|
+
key and value of each member, with this bound to the containing
|
64
|
+
object. The value that is returned from your method will be
|
65
|
+
serialized. If your method returns undefined, then the member will
|
66
|
+
be excluded from the serialization.
|
67
|
+
|
68
|
+
If the replacer parameter is an array of strings, then it will be
|
69
|
+
used to select the members to be serialized. It filters the results
|
70
|
+
such that only members with keys listed in the replacer array are
|
71
|
+
stringified.
|
72
|
+
|
73
|
+
Values that do not have JSON representations, such as undefined or
|
74
|
+
functions, will not be serialized. Such values in objects will be
|
75
|
+
dropped; in arrays they will be replaced with null. You can use
|
76
|
+
a replacer function to replace those with JSON values.
|
77
|
+
JSON.stringify(undefined) returns undefined.
|
78
|
+
|
79
|
+
The optional space parameter produces a stringification of the
|
80
|
+
value that is filled with line breaks and indentation to make it
|
81
|
+
easier to read.
|
82
|
+
|
83
|
+
If the space parameter is a non-empty string, then that string will
|
84
|
+
be used for indentation. If the space parameter is a number, then
|
85
|
+
the indentation will be that many spaces.
|
86
|
+
|
87
|
+
Example:
|
88
|
+
|
89
|
+
text = JSON.stringify(['e', {pluribus: 'unum'}]);
|
90
|
+
// text is '["e",{"pluribus":"unum"}]'
|
91
|
+
|
92
|
+
|
93
|
+
text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
|
94
|
+
// text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
|
95
|
+
|
96
|
+
text = JSON.stringify([new Date()], function (key, value) {
|
97
|
+
return this[key] instanceof Date ?
|
98
|
+
'Date(' + this[key] + ')' : value;
|
99
|
+
});
|
100
|
+
// text is '["Date(---current time---)"]'
|
101
|
+
|
102
|
+
|
103
|
+
JSON.parse(text, reviver)
|
104
|
+
This method parses a JSON text to produce an object or array.
|
105
|
+
It can throw a SyntaxError exception.
|
106
|
+
|
107
|
+
The optional reviver parameter is a function that can filter and
|
108
|
+
transform the results. It receives each of the keys and values,
|
109
|
+
and its return value is used instead of the original value.
|
110
|
+
If it returns what it received, then the structure is not modified.
|
111
|
+
If it returns undefined then the member is deleted.
|
112
|
+
|
113
|
+
Example:
|
114
|
+
|
115
|
+
// Parse the text. Values that look like ISO date strings will
|
116
|
+
// be converted to Date objects.
|
117
|
+
|
118
|
+
myData = JSON.parse(text, function (key, value) {
|
119
|
+
var a;
|
120
|
+
if (typeof value === 'string') {
|
121
|
+
a =
|
122
|
+
/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
|
123
|
+
if (a) {
|
124
|
+
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
|
125
|
+
+a[5], +a[6]));
|
126
|
+
}
|
127
|
+
}
|
128
|
+
return value;
|
129
|
+
});
|
130
|
+
|
131
|
+
myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
|
132
|
+
var d;
|
133
|
+
if (typeof value === 'string' &&
|
134
|
+
value.slice(0, 5) === 'Date(' &&
|
135
|
+
value.slice(-1) === ')') {
|
136
|
+
d = new Date(value.slice(5, -1));
|
137
|
+
if (d) {
|
138
|
+
return d;
|
139
|
+
}
|
140
|
+
}
|
141
|
+
return value;
|
142
|
+
});
|
143
|
+
|
144
|
+
|
145
|
+
This is a reference implementation. You are free to copy, modify, or
|
146
|
+
redistribute.
|
147
|
+
*/
|
148
|
+
|
149
|
+
/*jslint evil: true, regexp: true */
|
150
|
+
|
151
|
+
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
|
152
|
+
call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
|
153
|
+
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
|
154
|
+
lastIndex, length, parse, prototype, push, replace, slice, stringify,
|
155
|
+
test, toJSON, toString, valueOf
|
156
|
+
*/
|
157
|
+
|
158
|
+
|
159
|
+
// Create a JSON object only if one does not already exist. We create the
|
160
|
+
// methods in a closure to avoid creating global variables.
|
161
|
+
|
162
|
+
var JSON;
|
163
|
+
if (!JSON) {
|
164
|
+
JSON = {};
|
165
|
+
}
|
166
|
+
|
167
|
+
(function () {
|
168
|
+
'use strict';
|
169
|
+
|
170
|
+
function f(n) {
|
171
|
+
// Format integers to have at least two digits.
|
172
|
+
return n < 10 ? '0' + n : n;
|
173
|
+
}
|
174
|
+
|
175
|
+
if (typeof Date.prototype.toJSON !== 'function') {
|
176
|
+
|
177
|
+
Date.prototype.toJSON = function (key) {
|
178
|
+
|
179
|
+
return isFinite(this.valueOf())
|
180
|
+
? this.getUTCFullYear() + '-' +
|
181
|
+
f(this.getUTCMonth() + 1) + '-' +
|
182
|
+
f(this.getUTCDate()) + 'T' +
|
183
|
+
f(this.getUTCHours()) + ':' +
|
184
|
+
f(this.getUTCMinutes()) + ':' +
|
185
|
+
f(this.getUTCSeconds()) + 'Z'
|
186
|
+
: null;
|
187
|
+
};
|
188
|
+
|
189
|
+
String.prototype.toJSON =
|
190
|
+
Number.prototype.toJSON =
|
191
|
+
Boolean.prototype.toJSON = function (key) {
|
192
|
+
return this.valueOf();
|
193
|
+
};
|
194
|
+
}
|
195
|
+
|
196
|
+
var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
197
|
+
escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
198
|
+
gap,
|
199
|
+
indent,
|
200
|
+
meta = { // table of character substitutions
|
201
|
+
'\b': '\\b',
|
202
|
+
'\t': '\\t',
|
203
|
+
'\n': '\\n',
|
204
|
+
'\f': '\\f',
|
205
|
+
'\r': '\\r',
|
206
|
+
'"' : '\\"',
|
207
|
+
'\\': '\\\\'
|
208
|
+
},
|
209
|
+
rep;
|
210
|
+
|
211
|
+
|
212
|
+
function quote(string) {
|
213
|
+
|
214
|
+
// If the string contains no control characters, no quote characters, and no
|
215
|
+
// backslash characters, then we can safely slap some quotes around it.
|
216
|
+
// Otherwise we must also replace the offending characters with safe escape
|
217
|
+
// sequences.
|
218
|
+
|
219
|
+
escapable.lastIndex = 0;
|
220
|
+
return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
|
221
|
+
var c = meta[a];
|
222
|
+
return typeof c === 'string'
|
223
|
+
? c
|
224
|
+
: '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
225
|
+
}) + '"' : '"' + string + '"';
|
226
|
+
}
|
227
|
+
|
228
|
+
|
229
|
+
function str(key, holder) {
|
230
|
+
|
231
|
+
// Produce a string from holder[key].
|
232
|
+
|
233
|
+
var i, // The loop counter.
|
234
|
+
k, // The member key.
|
235
|
+
v, // The member value.
|
236
|
+
length,
|
237
|
+
mind = gap,
|
238
|
+
partial,
|
239
|
+
value = holder[key];
|
240
|
+
|
241
|
+
// If the value has a toJSON method, call it to obtain a replacement value.
|
242
|
+
|
243
|
+
if (value && typeof value === 'object' &&
|
244
|
+
typeof value.toJSON === 'function') {
|
245
|
+
value = value.toJSON(key);
|
246
|
+
}
|
247
|
+
|
248
|
+
// If we were called with a replacer function, then call the replacer to
|
249
|
+
// obtain a replacement value.
|
250
|
+
|
251
|
+
if (typeof rep === 'function') {
|
252
|
+
value = rep.call(holder, key, value);
|
253
|
+
}
|
254
|
+
|
255
|
+
// What happens next depends on the value's type.
|
256
|
+
|
257
|
+
switch (typeof value) {
|
258
|
+
case 'string':
|
259
|
+
return quote(value);
|
260
|
+
|
261
|
+
case 'number':
|
262
|
+
|
263
|
+
// JSON numbers must be finite. Encode non-finite numbers as null.
|
264
|
+
|
265
|
+
return isFinite(value) ? String(value) : 'null';
|
266
|
+
|
267
|
+
case 'boolean':
|
268
|
+
case 'null':
|
269
|
+
|
270
|
+
// If the value is a boolean or null, convert it to a string. Note:
|
271
|
+
// typeof null does not produce 'null'. The case is included here in
|
272
|
+
// the remote chance that this gets fixed someday.
|
273
|
+
|
274
|
+
return String(value);
|
275
|
+
|
276
|
+
// If the type is 'object', we might be dealing with an object or an array or
|
277
|
+
// null.
|
278
|
+
|
279
|
+
case 'object':
|
280
|
+
|
281
|
+
// Due to a specification blunder in ECMAScript, typeof null is 'object',
|
282
|
+
// so watch out for that case.
|
283
|
+
|
284
|
+
if (!value) {
|
285
|
+
return 'null';
|
286
|
+
}
|
287
|
+
|
288
|
+
// Make an array to hold the partial results of stringifying this object value.
|
289
|
+
|
290
|
+
gap += indent;
|
291
|
+
partial = [];
|
292
|
+
|
293
|
+
// Is the value an array?
|
294
|
+
|
295
|
+
if (Object.prototype.toString.apply(value) === '[object Array]') {
|
296
|
+
|
297
|
+
// The value is an array. Stringify every element. Use null as a placeholder
|
298
|
+
// for non-JSON values.
|
299
|
+
|
300
|
+
length = value.length;
|
301
|
+
for (i = 0; i < length; i += 1) {
|
302
|
+
partial[i] = str(i, value) || 'null';
|
303
|
+
}
|
304
|
+
|
305
|
+
// Join all of the elements together, separated with commas, and wrap them in
|
306
|
+
// brackets.
|
307
|
+
|
308
|
+
v = partial.length === 0
|
309
|
+
? '[]'
|
310
|
+
: gap
|
311
|
+
? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
|
312
|
+
: '[' + partial.join(',') + ']';
|
313
|
+
gap = mind;
|
314
|
+
return v;
|
315
|
+
}
|
316
|
+
|
317
|
+
// If the replacer is an array, use it to select the members to be stringified.
|
318
|
+
|
319
|
+
if (rep && typeof rep === 'object') {
|
320
|
+
length = rep.length;
|
321
|
+
for (i = 0; i < length; i += 1) {
|
322
|
+
if (typeof rep[i] === 'string') {
|
323
|
+
k = rep[i];
|
324
|
+
v = str(k, value);
|
325
|
+
if (v) {
|
326
|
+
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
327
|
+
}
|
328
|
+
}
|
329
|
+
}
|
330
|
+
} else {
|
331
|
+
|
332
|
+
// Otherwise, iterate through all of the keys in the object.
|
333
|
+
|
334
|
+
for (k in value) {
|
335
|
+
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
336
|
+
v = str(k, value);
|
337
|
+
if (v) {
|
338
|
+
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
339
|
+
}
|
340
|
+
}
|
341
|
+
}
|
342
|
+
}
|
343
|
+
|
344
|
+
// Join all of the member texts together, separated with commas,
|
345
|
+
// and wrap them in braces.
|
346
|
+
|
347
|
+
v = partial.length === 0
|
348
|
+
? '{}'
|
349
|
+
: gap
|
350
|
+
? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
|
351
|
+
: '{' + partial.join(',') + '}';
|
352
|
+
gap = mind;
|
353
|
+
return v;
|
354
|
+
}
|
355
|
+
}
|
356
|
+
|
357
|
+
// If the JSON object does not yet have a stringify method, give it one.
|
358
|
+
|
359
|
+
if (typeof JSON.stringify !== 'function') {
|
360
|
+
JSON.stringify = function (value, replacer, space) {
|
361
|
+
|
362
|
+
// The stringify method takes a value and an optional replacer, and an optional
|
363
|
+
// space parameter, and returns a JSON text. The replacer can be a function
|
364
|
+
// that can replace values, or an array of strings that will select the keys.
|
365
|
+
// A default replacer method can be provided. Use of the space parameter can
|
366
|
+
// produce text that is more easily readable.
|
367
|
+
|
368
|
+
var i;
|
369
|
+
gap = '';
|
370
|
+
indent = '';
|
371
|
+
|
372
|
+
// If the space parameter is a number, make an indent string containing that
|
373
|
+
// many spaces.
|
374
|
+
|
375
|
+
if (typeof space === 'number') {
|
376
|
+
for (i = 0; i < space; i += 1) {
|
377
|
+
indent += ' ';
|
378
|
+
}
|
379
|
+
|
380
|
+
// If the space parameter is a string, it will be used as the indent string.
|
381
|
+
|
382
|
+
} else if (typeof space === 'string') {
|
383
|
+
indent = space;
|
384
|
+
}
|
385
|
+
|
386
|
+
// If there is a replacer, it must be a function or an array.
|
387
|
+
// Otherwise, throw an error.
|
388
|
+
|
389
|
+
rep = replacer;
|
390
|
+
if (replacer && typeof replacer !== 'function' &&
|
391
|
+
(typeof replacer !== 'object' ||
|
392
|
+
typeof replacer.length !== 'number')) {
|
393
|
+
throw new Error('JSON.stringify');
|
394
|
+
}
|
395
|
+
|
396
|
+
// Make a fake root object containing our value under the key of ''.
|
397
|
+
// Return the result of stringifying the value.
|
398
|
+
|
399
|
+
return str('', {'': value});
|
400
|
+
};
|
401
|
+
}
|
402
|
+
|
403
|
+
|
404
|
+
// If the JSON object does not yet have a parse method, give it one.
|
405
|
+
|
406
|
+
if (typeof JSON.parse !== 'function') {
|
407
|
+
JSON.parse = function (text, reviver) {
|
408
|
+
|
409
|
+
// The parse method takes a text and an optional reviver function, and returns
|
410
|
+
// a JavaScript value if the text is a valid JSON text.
|
411
|
+
|
412
|
+
var j;
|
413
|
+
|
414
|
+
function walk(holder, key) {
|
415
|
+
|
416
|
+
// The walk method is used to recursively walk the resulting structure so
|
417
|
+
// that modifications can be made.
|
418
|
+
|
419
|
+
var k, v, value = holder[key];
|
420
|
+
if (value && typeof value === 'object') {
|
421
|
+
for (k in value) {
|
422
|
+
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
423
|
+
v = walk(value, k);
|
424
|
+
if (v !== undefined) {
|
425
|
+
value[k] = v;
|
426
|
+
} else {
|
427
|
+
delete value[k];
|
428
|
+
}
|
429
|
+
}
|
430
|
+
}
|
431
|
+
}
|
432
|
+
return reviver.call(holder, key, value);
|
433
|
+
}
|
434
|
+
|
435
|
+
|
436
|
+
// Parsing happens in four stages. In the first stage, we replace certain
|
437
|
+
// Unicode characters with escape sequences. JavaScript handles many characters
|
438
|
+
// incorrectly, either silently deleting them, or treating them as line endings.
|
439
|
+
|
440
|
+
text = String(text);
|
441
|
+
cx.lastIndex = 0;
|
442
|
+
if (cx.test(text)) {
|
443
|
+
text = text.replace(cx, function (a) {
|
444
|
+
return '\\u' +
|
445
|
+
('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
446
|
+
});
|
447
|
+
}
|
448
|
+
|
449
|
+
// In the second stage, we run the text against regular expressions that look
|
450
|
+
// for non-JSON patterns. We are especially concerned with '()' and 'new'
|
451
|
+
// because they can cause invocation, and '=' because it can cause mutation.
|
452
|
+
// But just to be safe, we want to reject all unexpected forms.
|
453
|
+
|
454
|
+
// We split the second stage into 4 regexp operations in order to work around
|
455
|
+
// crippling inefficiencies in IE's and Safari's regexp engines. First we
|
456
|
+
// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
|
457
|
+
// replace all simple value tokens with ']' characters. Third, we delete all
|
458
|
+
// open brackets that follow a colon or comma or that begin the text. Finally,
|
459
|
+
// we look to see that the remaining characters are only whitespace or ']' or
|
460
|
+
// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
|
461
|
+
|
462
|
+
if (/^[\],:{}\s]*$/
|
463
|
+
.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
|
464
|
+
.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
|
465
|
+
.replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
|
466
|
+
|
467
|
+
// In the third stage we use the eval function to compile the text into a
|
468
|
+
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
|
469
|
+
// in JavaScript: it can begin a block or an object literal. We wrap the text
|
470
|
+
// in parens to eliminate the ambiguity.
|
471
|
+
|
472
|
+
j = eval('(' + text + ')');
|
473
|
+
|
474
|
+
// In the optional fourth stage, we recursively walk the new structure, passing
|
475
|
+
// each name/value pair to a reviver function for possible transformation.
|
476
|
+
|
477
|
+
return typeof reviver === 'function'
|
478
|
+
? walk({'': j}, '')
|
479
|
+
: j;
|
480
|
+
}
|
481
|
+
|
482
|
+
// If the text is not JSON parseable, then a SyntaxError is thrown.
|
483
|
+
|
484
|
+
throw new SyntaxError('JSON.parse');
|
485
|
+
};
|
486
|
+
}
|
487
|
+
}());
|