diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/Resources.php | 18 | ||||
| -rw-r--r-- | resources/src/skip-fetch.js | 1 | ||||
| -rw-r--r-- | resources/src/skip-intersectionObserver.js | 1 | ||||
| -rw-r--r-- | resources/src/skip-web2017-polyfills.js | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/resources/Resources.php b/resources/Resources.php index 0911eb6d9354..5f0747512b0d 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -132,15 +132,19 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'fetch-polyfill' => [ - 'scripts' => 'resources/lib/fetch-polyfill/fetch.umd.js', - 'skipFunction' => 'resources/src/skip-fetch.js', + // Temporary alias. Use web2017-polyfills instead. + 'scripts' => [], 'targets' => [ 'desktop', 'mobile' ], - 'dependencies' => [ 'es6-polyfills' ] + 'dependencies' => [ 'web2017-polyfills' ] ], - 'intersectionObserver-polyfill' => [ - 'scripts' => 'resources/lib/intersection-observer/intersection-observer.js', - 'skipFunction' => 'resources/src/skip-intersectionObserver.js', - 'targets' => [ 'desktop', 'mobile' ] + 'web2017-polyfills' => [ + 'scripts' => [ + 'resources/lib/intersection-observer/intersection-observer.js', + 'resources/lib/fetch-polyfill/fetch.umd.js' + ], + 'skipFunction' => 'resources/src/skip-web2017-polyfills.js', + 'targets' => [ 'desktop', 'mobile' ], + 'dependencies' => [ 'es6-polyfills' ] ], 'mediawiki.base' => [ 'localBasePath' => "$IP/resources/src/mediawiki.base", diff --git a/resources/src/skip-fetch.js b/resources/src/skip-fetch.js deleted file mode 100644 index 45c48e544867..000000000000 --- a/resources/src/skip-fetch.js +++ /dev/null @@ -1 +0,0 @@ -return typeof fetch === 'function'; diff --git a/resources/src/skip-intersectionObserver.js b/resources/src/skip-intersectionObserver.js deleted file mode 100644 index e2ba34e5884f..000000000000 --- a/resources/src/skip-intersectionObserver.js +++ /dev/null @@ -1 +0,0 @@ -return 'IntersectionObserver' in window;
\ No newline at end of file diff --git a/resources/src/skip-web2017-polyfills.js b/resources/src/skip-web2017-polyfills.js new file mode 100644 index 000000000000..aa9806d81da5 --- /dev/null +++ b/resources/src/skip-web2017-polyfills.js @@ -0,0 +1,2 @@ +return 'IntersectionObserver' in window && + typeof fetch === 'function';
\ No newline at end of file |