diff options
Diffstat (limited to 'web_src')
-rw-r--r-- | web_src/js/index.js | 1 | ||||
-rw-r--r-- | web_src/js/polyfills.js | 17 | ||||
-rw-r--r-- | web_src/js/publicpath.js | 10 | ||||
-rw-r--r-- | web_src/less/_base.less | 19 |
4 files changed, 6 insertions, 41 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index b808812372..af1c4acd46 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3,7 +3,6 @@ /* exported toggleDeadlineForm, setDeadline, updateDeadline, deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */ import './publicpath.js'; -import './polyfills.js'; import Vue from 'vue'; import 'jquery.are-you-sure'; diff --git a/web_src/js/polyfills.js b/web_src/js/polyfills.js deleted file mode 100644 index 0063b6d253..0000000000 --- a/web_src/js/polyfills.js +++ /dev/null @@ -1,17 +0,0 @@ -// compat: IE11 -if (!Element.prototype.matches) { - Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector; -} - -// compat: IE11 -if (!Element.prototype.closest) { - Element.prototype.closest = function (s) { - let el = this; - - do { - if (el.matches(s)) return el; - el = el.parentElement || el.parentNode; - } while (el !== null && el.nodeType === 1); - return null; - }; -} diff --git a/web_src/js/publicpath.js b/web_src/js/publicpath.js index 392c03e700..892bb459aa 100644 --- a/web_src/js/publicpath.js +++ b/web_src/js/publicpath.js @@ -1,11 +1,5 @@ // This sets up webpack's chunk loading to load resources from the 'public' // directory. This file must be imported before any lazy-loading is being attempted. -if (document.currentScript && document.currentScript.src) { - const url = new URL(document.currentScript.src); - __webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); -} else { - // compat: IE11 - const script = document.querySelector('script[src*="/index.js"]'); - __webpack_public_path__ = script.getAttribute('src').replace(/\/[^/]*?\/[^/]*?$/, '/'); -} +const url = new URL(document.currentScript.src); +__webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/'); diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 823ad151d3..03dc61a987 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -7,9 +7,7 @@ local('Roboto'), local('Roboto-Regular'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2') format('woff2'), - /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff') format('woff'); + url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2') format('woff2'); } /* roboto-italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */ @@ -20,10 +18,7 @@ src: local('Roboto Italic'), local('Roboto-Italic'), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2') format('woff2'), - /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff') format('woff'); + url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2') format('woff2'); } /* roboto-700 - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */ @@ -34,10 +29,7 @@ src: local('Roboto Bold'), local('Roboto-Bold'), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2') format('woff2'), - /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff') format('woff'); + url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2') format('woff2'); } /* roboto-700italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */ @@ -48,10 +40,7 @@ src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2') format('woff2'), - /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ - url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff') format('woff'); + url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2') format('woff2'); } @font-face { |