aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-06-18 22:17:34 +1000
committerSam Potts <sam@potts.es>2018-06-18 22:17:34 +1000
commitd64ed4ba5a53547e255eda85d8ab7801298921fc (patch)
tree5652be59152169401667fa9264278a9a97c57bc6 /src/js
parentffd864ed39340c081adb9e4a45b3c9cfe4c139e3 (diff)
parent22d524ac9d1a688d8493de0b79ff95842353e4b7 (diff)
downloadplyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.tar.lz
plyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.tar.xz
plyr-d64ed4ba5a53547e255eda85d8ab7801298921fc.zip
Merge branch 'develop' into a11y-improvements
# Conflicts: # dist/plyr.js.map # dist/plyr.min.js # dist/plyr.min.js.map
Diffstat (limited to 'src/js')
-rw-r--r--src/js/plyr.js2
-rw-r--r--src/js/plyr.polyfilled.js2
-rw-r--r--src/js/utils/fetch.js2
-rw-r--r--src/js/utils/loadSprite.js1
4 files changed, 4 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 336a1c38..249c296f 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v3.3.12
+// plyr.js v3.3.14
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js
index 2c19ae1d..dccde049 100644
--- a/src/js/plyr.polyfilled.js
+++ b/src/js/plyr.polyfilled.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr Polyfilled Build
-// plyr.js v3.3.12
+// plyr.js v3.3.14
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================
diff --git a/src/js/utils/fetch.js b/src/js/utils/fetch.js
index 1e506cd0..ee33ea7c 100644
--- a/src/js/utils/fetch.js
+++ b/src/js/utils/fetch.js
@@ -26,7 +26,7 @@ export default function fetch(url, responseType = 'text') {
});
request.addEventListener('error', () => {
- throw new Error(request.statusText);
+ throw new Error(request.status);
});
request.open('GET', url, true);
diff --git a/src/js/utils/loadSprite.js b/src/js/utils/loadSprite.js
index dbb00cf2..f05795f8 100644
--- a/src/js/utils/loadSprite.js
+++ b/src/js/utils/loadSprite.js
@@ -3,6 +3,7 @@
// ==========================================================================
import Storage from './../storage';
+import fetch from './fetch';
import is from './is';
// Load an external SVG sprite