From 1a3e1ab7bc406f5f51f528980339f53d112bada7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 6 Aug 2020 18:56:04 +0100 Subject: [PATCH] Move html5shiv to be a yarn managed asset --- Vendorfile | 4 - app/assets/config/manifest.js | 2 + app/views/layouts/_head.html.erb | 2 +- package.json | 3 +- vendor/assets/javascripts/html5shiv.js | 326 ------------------------- yarn.lock | 5 + 6 files changed, 10 insertions(+), 332 deletions(-) delete mode 100644 vendor/assets/javascripts/html5shiv.js diff --git a/Vendorfile b/Vendorfile index f940b9ece..a731e5f20 100644 --- a/Vendorfile +++ b/Vendorfile @@ -68,10 +68,6 @@ folder 'vendor/assets' do file 'es6.js', 'https://polyfill.io/v3/polyfill.js?features=es6&flags=gated,always' end - folder 'javascripts' do - file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js' - end - folder 'swfobject' do from 'git://github.com/swfobject/swfobject.git', :tag => '2.2' do file 'expressInstall.swf', 'swfobject/expressInstall.swf' diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index bc308b846..478fc3492 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -21,3 +21,5 @@ //= link_tree ../../../vendor/assets/potlatch2 .zip //= link_directory ../../../vendor/assets/swfobject + +//= link html5shiv/dist/html5shiv.js diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 40d5e6200..19fd31343 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,7 +1,7 @@ <%= tag.head :data => application_data do %> - <%= javascript_include_tag "html5shiv" unless browser.html5? %> + <%= javascript_include_tag "html5shiv/dist/html5shiv" unless browser.html5? %> <%= javascript_include_tag "es5" unless browser.es5? %> <%= javascript_include_tag "es6" unless browser.es6? %> <%= javascript_include_tag "application" %> diff --git a/package.json b/package.json index b1bf411d9..d84e5d27f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "name": "openstreetmap", "private": true, "dependencies": { - "bs-custom-file-input": "^1.3.4" + "bs-custom-file-input": "^1.3.4", + "html5shiv": "^3.7.3" }, "devDependencies": { "eslint": "^7.3.1" diff --git a/vendor/assets/javascripts/html5shiv.js b/vendor/assets/javascripts/html5shiv.js deleted file mode 100644 index 45ea723dd..000000000 --- a/vendor/assets/javascripts/html5shiv.js +++ /dev/null @@ -1,326 +0,0 @@ -/** -* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed -*/ -;(function(window, document) { -/*jshint evil:true */ - /** version */ - var version = '3.7.3'; - - /** Preset options */ - var options = window.html5 || {}; - - /** Used to skip problem elements */ - var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i; - - /** Not all elements can be cloned in IE **/ - var saveClones = /^(?: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; - - /** Detect whether the browser supports default html5 styles */ - var supportsHtml5Styles; - - /** Name of the expando, to work with multiple documents or to re-shiv one document */ - var expando = '_html5shiv'; - - /** The id for the the documents expando */ - var expanID = 0; - - /** Cached data for each document */ - var expandoData = {}; - - /** Detect whether the browser supports unknown elements */ - var supportsUnknownElements; - - (function() { - try { - var a = document.createElement('a'); - a.innerHTML = ''; - //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles - supportsHtml5Styles = ('hidden' in a); - - supportsUnknownElements = a.childNodes.length == 1 || (function() { - // assign a false positive if unable to shiv - (document.createElement)('a'); - var frag = document.createDocumentFragment(); - return ( - typeof frag.cloneNode == 'undefined' || - typeof frag.createDocumentFragment == 'undefined' || - typeof frag.createElement == 'undefined' - ); - }()); - } catch(e) { - // assign a false positive if detection fails => unable to shiv - supportsHtml5Styles = true; - supportsUnknownElements = true; - } - - }()); - - /*--------------------------------------------------------------------------*/ - - /** - * Creates a style sheet with the given CSS text and adds it to the document. - * @private - * @param {Document} ownerDocument The document. - * @param {String} cssText The CSS text. - * @returns {StyleSheet} The style element. - */ - function addStyleSheet(ownerDocument, cssText) { - var p = ownerDocument.createElement('p'), - parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; - - p.innerHTML = 'x'; - return parent.insertBefore(p.lastChild, parent.firstChild); - } - - /** - * Returns the value of `html5.elements` as an array. - * @private - * @returns {Array} An array of shived element node names. - */ - function getElements() { - var elements = html5.elements; - return typeof elements == 'string' ? elements.split(' ') : elements; - } - - /** - * Extends the built-in list of html5 elements - * @memberOf html5 - * @param {String|Array} newElements whitespace separated list or array of new element names to shiv - * @param {Document} ownerDocument The context document. - */ - function addElements(newElements, ownerDocument) { - var elements = html5.elements; - if(typeof elements != 'string'){ - elements = elements.join(' '); - } - if(typeof newElements != 'string'){ - newElements = newElements.join(' '); - } - html5.elements = elements +' '+ newElements; - shivDocument(ownerDocument); - } - - /** - * Returns the data associated to the given document - * @private - * @param {Document} ownerDocument The document. - * @returns {Object} An object of data. - */ - function getExpandoData(ownerDocument) { - var data = expandoData[ownerDocument[expando]]; - if (!data) { - data = {}; - expanID++; - ownerDocument[expando] = expanID; - expandoData[expanID] = data; - } - return data; - } - - /** - * returns a shived element for the given nodeName and document - * @memberOf html5 - * @param {String} nodeName name of the element - * @param {Document|DocumentFragment} ownerDocument The context document. - * @returns {Object} The shived element. - */ - function createElement(nodeName, ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createElement(nodeName); - } - if (!data) { - data = getExpandoData(ownerDocument); - } - var node; - - if (data.cache[nodeName]) { - node = data.cache[nodeName].cloneNode(); - } else if (saveClones.test(nodeName)) { - node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode(); - } else { - node = data.createElem(nodeName); - } - - // Avoid adding some elements to fragments in IE < 9 because - // * Attributes like `name` or `type` cannot be set/changed once an element - // is inserted into a document/fragment - // * Link elements with `src` attributes that are inaccessible, as with - // a 403 response, will cause the tab/window to crash - // * Script elements appended to fragments will execute when their `src` - // or `text` property is set - return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node; - } - - /** - * returns a shived DocumentFragment for the given document - * @memberOf html5 - * @param {Document} ownerDocument The context document. - * @returns {Object} The shived DocumentFragment. - */ - function createDocumentFragment(ownerDocument, data){ - if (!ownerDocument) { - ownerDocument = document; - } - if(supportsUnknownElements){ - return ownerDocument.createDocumentFragment(); - } - data = data || getExpandoData(ownerDocument); - var clone = data.frag.cloneNode(), - i = 0, - elems = getElements(), - l = elems.length; - for(;i