Fix for local storage issue

changelog.md

@@ -1,3 +1,7 @@
+# v3.0.1
+
+*   Fix for trying to accessing local storage when it's blocked
+
 # v3.0.0
 
 This is a massive release. A _mostly_ complete rewrite in ES6. What started out as a few changes quickly snowballed. There's many breaking changes so be careful upgrading.
@@ -67,7 +71,7 @@ You gotta break eggs to make an omelette. Sadly, there's quite a few breaking ch
 
 ### Polyfilling
 
-Because we're using the fancy new ES6 syntax, you will need to polyfill for vintage browsers if you want to use Plyr and still support them. Luckily there's a decent service for this that makes it painless, [polyfill.io](https://polyfill.io).
+Because we're using the fancy new ES6 syntax, you will need to polyfill for vintage browsers if you want to use Plyr and still support them. Luckily there's a decent service for this that makes it painless, [polyfill.io](https://polyfill.io). Alternatively, you can use the prebuilt polyfilled build but bear in mind this is 20kb larger. I'd suggest working our your own polyfill strategy.
 
 ## v2.0.18
 

demo/index.html

@@ -163,7 +163,7 @@
        c-1.1,0.9-2.5,1.4-4.1,1.4c-0.3,0-0.5,0-0.8,0c1.5,0.9,3.2,1.5,5,1.5c6,0,9.3-5,9.3-9.3c0-0.1,0-0.3,0-0.4C15,4.3,15.6,3.7,16,3z"></path>
         </svg>
         <p>If you think Plyr's good,
-            <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&url=http%3A%2F%2Fplyr.io&via=Sam_Potts"
+            <a href="https://twitter.com/intent/tweet?text=A+simple+HTML5+media+player+with+custom+controls+and+WebVTT+captions.&amp;url=http%3A%2F%2Fplyr.io&amp;via=Sam_Potts"
                 target="_blank" data-shr-network="twitter">tweet it</a>
         </p>
     </aside>
@@ -181,7 +181,7 @@
     <script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async></script>
 
     <!-- Docs script -->
-    <script src="dist/demo.js"></script>
+    <script src="dist/demo.js" crossorigin="anonymous"></script>
 </body>
 
 </html>

demo/src/js/demo.js

@@ -4,7 +4,19 @@
 // Please see readme.md in the root or github.com/sampotts/plyr
 // ==========================================================================
 
-document.addEventListener('DOMContentLoaded', () => {
+import Raven from 'raven-js';
+
+(() => {
+    const isLive = window.location.host === 'plyr.io';
+
+    // Raven / Sentry
+    // For demo site (https://plyr.io) only
+    if (isLive) {
+        Raven.config('https://d4ad9866ad834437a4754e23937071e4@sentry.io/305555').install();
+    }
+
+    document.addEventListener('DOMContentLoaded', () => {
+        Raven.context(() => {
             if (window.shr) {
                 window.shr.setup({
                     count: {
@@ -220,12 +232,13 @@ document.addEventListener('DOMContentLoaded', () => {
                     newSource(currentType, true);
                 }
             }
-});
+        });
+    });
 
-// Google analytics
+    // Google analytics
-// For demo site (https://plyr.io) only
+    // For demo site (https://plyr.io) only
-/* eslint-disable */
+    /* eslint-disable */
-if (window.location.host === 'plyr.io') {
+    if (isLive) {
         (function(i, s, o, g, r, a, m) {
             i.GoogleAnalyticsObject = r;
             i[r] =
@@ -242,5 +255,6 @@ if (window.location.host === 'plyr.io') {
         })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
         window.ga('create', 'UA-40881672-11', 'auto');
         window.ga('send', 'pageview');
-}
+    }
-/* eslint-enable */
+    /* eslint-enable */
+})();

dist/plyr.js

@@ -77,7 +77,7 @@ var defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.0.0-beta.20/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.0.1/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -4306,9 +4306,13 @@ var Storage = function () {
     createClass(Storage, [{
         key: 'get',
         value: function get$$1(key) {
+            if (!Storage.supported) {
+                return null;
+            }
+
             var store = window.localStorage.getItem(this.key);
 
-            if (!Storage.supported || utils.is.empty(store)) {
+            if (utils.is.empty(store)) {
                 return null;
             }
 
@@ -4346,6 +4350,7 @@ var Storage = function () {
     }], [{
         key: 'supported',
         get: function get$$1() {
+            try {
                 if (!('localStorage' in window)) {
                     return false;
                 }
@@ -4354,9 +4359,9 @@ var Storage = function () {
 
                 // Try to use it (it might be disabled, e.g. user is in private mode)
                 // see: https://github.com/sampotts/plyr/issues/131
-            try {
                 window.localStorage.setItem(test, test);
                 window.localStorage.removeItem(test);
+
                 return true;
             } catch (e) {
                 return false;
@@ -6021,7 +6026,7 @@ var source = {
 
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.0-beta.20
+// plyr.js v3.0.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -6305,6 +6310,10 @@ var Plyr = function () {
         value: function play() {
             var _this2 = this;
 
+            if (!utils.is.function(this.media.play)) {
+                return null;
+            }
+
             // If ads are enabled, wait for them first
             if (this.ads.enabled && !this.ads.initialized) {
                 return this.ads.managerPromise.then(function () {
@@ -6325,7 +6334,7 @@ var Plyr = function () {
     }, {
         key: 'pause',
         value: function pause() {
-            if (!this.playing) {
+            if (!this.playing || !utils.is.function(this.media.pause)) {
                 return;
             }
 

dist/plyr.polyfilled.js

@@ -5268,7 +5268,7 @@ var defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.0.0/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.0.1/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -9497,9 +9497,13 @@ var Storage = function () {
     createClass(Storage, [{
         key: 'get',
         value: function get(key) {
+            if (!Storage.supported) {
+                return null;
+            }
+
             var store = window.localStorage.getItem(this.key);
 
-            if (!Storage.supported || utils.is.empty(store)) {
+            if (utils.is.empty(store)) {
                 return null;
             }
 
@@ -9537,6 +9541,7 @@ var Storage = function () {
     }], [{
         key: 'supported',
         get: function get() {
+            try {
                 if (!('localStorage' in window)) {
                     return false;
                 }
@@ -9545,9 +9550,9 @@ var Storage = function () {
 
                 // Try to use it (it might be disabled, e.g. user is in private mode)
                 // see: https://github.com/sampotts/plyr/issues/131
-            try {
                 window.localStorage.setItem(test, test);
                 window.localStorage.removeItem(test);
+
                 return true;
             } catch (e) {
                 return false;
@@ -11212,7 +11217,7 @@ var source = {
 
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.0
+// plyr.js v3.0.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -11496,6 +11501,10 @@ var Plyr$1 = function () {
         value: function play() {
             var _this2 = this;
 
+            if (!utils.is.function(this.media.play)) {
+                return null;
+            }
+
             // If ads are enabled, wait for them first
             if (this.ads.enabled && !this.ads.initialized) {
                 return this.ads.managerPromise.then(function () {
@@ -11516,7 +11525,7 @@ var Plyr$1 = function () {
     }, {
         key: 'pause',
         value: function pause() {
-            if (!this.playing) {
+            if (!this.playing || !utils.is.function(this.media.pause)) {
                 return;
             }
 
@@ -12512,7 +12521,7 @@ var Plyr$1 = function () {
 
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.0.0-beta.20
+// plyr.js v3.0.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================

gulpfile.js

@@ -70,10 +70,11 @@ const paths = {
         root: path.join(root, 'demo/'),
     },
     upload: [
-        path.join(root, `dist/*${minSuffix}.js`),
+        path.join(root, `dist/*${minSuffix}.*`),
         path.join(root, 'dist/*.css'),
         path.join(root, 'dist/*.svg'),
-        path.join(root, 'demo/dist/**'),
+        path.join(root, `demo/dist/*${minSuffix}.*`),
+        path.join(root, 'demo/dist/*.css'),
     ],
 };
 
@@ -303,7 +304,8 @@ if (Object.keys(aws).includes('cdn') && Object.keys(aws).includes('demo')) {
         console.log(`Uploading '${version}' to ${aws.cdn.domain}...`);
 
         // Upload to CDN
-        return gulp
+        return (
+            gulp
                 .src(paths.upload)
                 .pipe(
                     rename(p => {
@@ -311,6 +313,8 @@ if (Object.keys(aws).includes('cdn') && Object.keys(aws).includes('demo')) {
                         p.dirname = p.dirname.replace('.', version); // eslint-disable-line
                     }),
                 )
+                // Remove min suffix from source map URL
+                .pipe(replace(/sourceMappingURL=([\w-?.]+)/, (match, p1) => `sourceMappingURL=${p1.replace(minSuffix, '')}`))
                 .pipe(
                     size({
                         showFiles: true,
@@ -318,7 +322,8 @@ if (Object.keys(aws).includes('cdn') && Object.keys(aws).includes('demo')) {
                     }),
                 )
                 .pipe(replace(localPath, versionPath))
-            .pipe(s3(aws.cdn, options.cdn));
+                .pipe(s3(aws.cdn, options.cdn))
+        );
     });
 
     // Publish to demo bucket

package.json

@@ -1,6 +1,6 @@
 {
     "name": "plyr",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
     "homepage": "https://plyr.io",
     "main": "./dist/plyr.js",
@@ -13,7 +13,7 @@
         "babel-plugin-external-helpers": "^6.22.0",
         "babel-preset-env": "^1.6.1",
         "del": "^3.0.0",
-        "eslint": "^4.18.2",
+        "eslint": "^4.19.0",
         "eslint-config-airbnb-base": "^12.1.0",
         "eslint-config-prettier": "^2.9.0",
         "eslint-plugin-import": "^2.9.0",
@@ -65,6 +65,7 @@
     "author": "Sam Potts <sam@potts.es>",
     "dependencies": {
         "babel-polyfill": "^6.26.0",
-        "custom-event-polyfill": "^0.3.0"
+        "custom-event-polyfill": "^0.3.0",
+        "raven-js": "^3.23.3"
     }
 }

readme.md

@@ -4,7 +4,7 @@ A simple, lightweight, accessible and customizable HTML5, YouTube and Vimeo medi
 
 [Checkout the demo](https://plyr.io) - [Donate to support Plyr](#donate) - [Chat on Slack](https://bit.ly/plyr-slack)
 
-[![Image of Plyr](https://cdn.plyr.io/static/demo/screenshot.png)](https://plyr.io)
+[![Image of Plyr](https://cdn.plyr.io/static/demo/screenshot.png?v=3)](https://plyr.io)
 
 ## Features
 
@@ -124,7 +124,7 @@ See [initialising](#initialising) for more information on advanced setups.
 If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript, you can use the following:
 
 ```html
-<script src="https://cdn.plyr.io/3.0.0/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.0.1/plyr.js"></script>
 ```
 
 _Note_: Be sure to read the [polyfills](#polyfills) section below about browser compatibility
@@ -140,17 +140,17 @@ Include the `plyr.css` stylsheet into your `<head>`
 If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
 
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/3.0.0/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/3.0.1/plyr.css">
 ```
 
 ### SVG Sprite
 
 The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For
-reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.0.0/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.0.1/plyr.svg`.
 
 ## Ads
 
-Plyr has partnered up with [ai.vi](http://vi.ai/publisher-video-monetization/?aid=plyrio) to offer monetization options for your videos. Getting setup is easy:
+Plyr has partnered up with [vi.ai](http://vi.ai/publisher-video-monetization/?aid=plyrio) to offer monetization options for your videos. Getting setup is easy:
 
 *   [Sign up for a vi.ai account](http://vi.ai/publisher-video-monetization/?aid=plyrio)
 *   Grab your publisher ID from the code snippet
@@ -703,7 +703,7 @@ Credit to the PayPal HTML5 Video player from which Plyr's caption functionality
 
 ## Thanks
 
-[![Fastly](https://www.fastly.com/sites/all/themes/custom/fastly2016/logo.png)](https://www.fastly.com/)
+[![Fastly](https://cdn.plyr.io/static/demo/fastly-logo.png)](https://www.fastly.com/)
 
 Massive thanks to [Fastly](https://www.fastly.com/) for providing the CDN services.
 

src/js/defaults.js

@@ -56,7 +56,7 @@ const defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.0.0/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.0.1/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.0
+// plyr.js v3.0.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -315,6 +315,10 @@ class Plyr {
      * Play the media, or play the advertisement (if they are not blocked)
      */
     play() {
+        if (!utils.is.function(this.media.play)) {
+            return null;
+        }
+
         // If ads are enabled, wait for them first
         if (this.ads.enabled && !this.ads.initialized) {
             return this.ads.managerPromise.then(() => this.ads.play()).catch(() => this.media.play());
@@ -328,7 +332,7 @@ class Plyr {
      * Pause the media
      */
     pause() {
-        if (!this.playing) {
+        if (!this.playing || !utils.is.function(this.media.pause)) {
             return;
         }
 

src/js/plyr.polyfilled.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.0.0
+// plyr.js v3.0.1
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================

src/js/storage.js

@@ -12,6 +12,7 @@ class Storage {
 
     // Check for actual support (see if we can use it)
     static get supported() {
+        try {
             if (!('localStorage' in window)) {
                 return false;
             }
@@ -20,9 +21,9 @@ class Storage {
 
             // Try to use it (it might be disabled, e.g. user is in private mode)
             // see: https://github.com/sampotts/plyr/issues/131
-        try {
             window.localStorage.setItem(test, test);
             window.localStorage.removeItem(test);
+
             return true;
         } catch (e) {
             return false;
@@ -30,9 +31,13 @@ class Storage {
     }
 
     get(key) {
+        if (!Storage.supported) {
+            return null;
+        }
+
         const store = window.localStorage.getItem(this.key);
 
-        if (!Storage.supported || utils.is.empty(store)) {
+        if (utils.is.empty(store)) {
             return null;
         }
 

yarn.lock

@@ -1690,9 +1690,9 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^4.18.2:
+eslint@^4.19.0:
-  version "4.18.2"
+  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.18.2.tgz#0f81267ad1012e7d2051e186a9004cc2267b8d45"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.0.tgz#9e900efb5506812ac374557034ef6f5c3642fc4c"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -1703,7 +1703,7 @@ eslint@^4.18.2:
     doctrine "^2.1.0"
     eslint-scope "^3.7.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
+    espree "^3.5.4"
     esquery "^1.0.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -1725,6 +1725,7 @@ eslint@^4.18.2:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
     semver "^5.3.0"
     strip-ansi "^4.0.0"
@@ -1732,7 +1733,7 @@ eslint@^4.18.2:
     table "4.0.2"
     text-table "~0.2.0"
 
-espree@^3.5.2:
+espree@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
@@ -4356,6 +4357,10 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+raven-js@^3.23.3:
+  version "3.23.3"
+  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.23.3.tgz#6174f506c7362eb8bb72b291af5f22edb44ef165"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -4484,6 +4489,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexpp@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
+
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"