v3.0.6

changelog.md

@@ -1,4 +1,18 @@
-# v3.0.3
+## v3.0.6
+
+*   Improved the logic for the custom handlers preventing default handlers
+
+## v3.0.5
+
+*   Removed console messages
+
+## v3.0.4
+
+*   Fixes for fullscreen not working inside iframes
+*   Fixes for custom handlers being able to prevent default
+*   Fixes for controls not hiding/showing correctly on Mobile Safari
+
+## v3.0.3
 
 *   Vimeo offset tweak (fixes #826)
 *   Fix for .stop() method (fixes #819)
@@ -9,11 +23,11 @@
 *   Fix fast-forward control (thanks @saadshahd)
 *   Fix the options link in the readme (thanks @DanielRuf)
 
-# v3.0.2
+## v3.0.2
 
 *   Fix for Safari not firing error events when trying to load blocked scripts
 
-# v3.0.1
+## v3.0.1
 
 *   Fix for trying to accessing local storage when it's blocked
 

demo/dist/demo.js

@@ -3843,9 +3843,12 @@ var singleton = Raven;
                     google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c'
                 },
                 ads: {
-                    // enabled: true,
+                    enabled: true,
                     publisherId: '918848828995742'
                 }
+                /* listeners: {
+                    seek: () => false,
+                }, */
             });
 
             // Expose for tinkering in the console

demo/src/js/demo.js

@@ -80,9 +80,12 @@ import Raven from 'raven-js';
                     google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c',
                 },
                 ads: {
-                    // enabled: true,
+                    enabled: true,
                     publisherId: '918848828995742',
                 },
+                /* listeners: {
+                    seek: () => false,
+                }, */
             });
 
             // Expose for tinkering in the console

dist/plyr.js

@@ -77,7 +77,7 @@ var defaults = {
     // Sprite (for icons)
     loadSprite: true,
     iconPrefix: 'plyr',
-    iconUrl: 'https://cdn.plyr.io/3.0.3/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.0.6/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -2130,8 +2130,6 @@ var Fullscreen = function () {
                 return;
             }
 
-            console.warn(this.prefix);
-
             // iOS native fullscreen doesn't need the request step
             if (browser.isIos && this.player.config.fullscreen.iosNative) {
                 if (this.player.playing) {
@@ -2174,8 +2172,6 @@ var Fullscreen = function () {
     }, {
         key: 'toggle',
         value: function toggle() {
-            console.warn('TOGGLE');
-
             if (!this.active) {
                 this.enter();
             } else {
@@ -4480,14 +4476,15 @@ var Listeners = function () {
             var proxy = function proxy(event, defaultHandler, customHandlerKey) {
                 var customHandler = _this4.player.config.listeners[customHandlerKey];
                 var hasCustomHandler = utils.is.function(customHandler);
+                var returned = true;
 
                 // Execute custom handler
                 if (hasCustomHandler) {
-                    customHandler.call(_this4.player, event);
+                    returned = customHandler.call(_this4.player, event);
                 }
 
                 // Only call default handler if not prevented in custom handler
-                if (!event.defaultPrevented && utils.is.function(defaultHandler)) {
+                if (returned && utils.is.function(defaultHandler)) {
                     defaultHandler.call(_this4.player, event);
                 }
             };
@@ -5760,8 +5757,6 @@ var youtube = {
                     // Reset timer
                     clearInterval(player.timers.playing);
 
-                    console.warn(event.data);
-
                     // Handle events
                     // -1   Unstarted
                     // 0    Ended
@@ -6414,7 +6409,7 @@ var source = {
 
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.3
+// plyr.js v3.0.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -6973,8 +6968,6 @@ var Plyr = function () {
             // then set the timer to hide the controls
             if (!show || this.playing) {
                 this.timers.controls = setTimeout(function () {
-                    console.warn(_this3.elements.controls.pressed, _this3.elements.controls.hover, delay);
-
                     // If the mouse is over the controls (and not entering fullscreen), bail
                     if ((_this3.elements.controls.pressed || _this3.elements.controls.hover) && !isEnterFullscreen) {
                         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.4/plyr.svg',
+    iconUrl: 'https://cdn.plyr.io/3.0.6/plyr.svg',
 
     // Blank video (used to prevent errors on source change)
     blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
@@ -7311,8 +7311,6 @@ var Fullscreen = function () {
                 return;
             }
 
-            console.warn(this.prefix);
-
             // iOS native fullscreen doesn't need the request step
             if (browser.isIos && this.player.config.fullscreen.iosNative) {
                 if (this.player.playing) {
@@ -7355,8 +7353,6 @@ var Fullscreen = function () {
     }, {
         key: 'toggle',
         value: function toggle() {
-            console.warn('TOGGLE');
-
             if (!this.active) {
                 this.enter();
             } else {
@@ -9661,14 +9657,15 @@ var Listeners = function () {
             var proxy = function proxy(event, defaultHandler, customHandlerKey) {
                 var customHandler = _this4.player.config.listeners[customHandlerKey];
                 var hasCustomHandler = utils.is.function(customHandler);
+                var returned = true;
 
                 // Execute custom handler
                 if (hasCustomHandler) {
-                    customHandler.call(_this4.player, event);
+                    returned = customHandler.call(_this4.player, event);
                 }
 
                 // Only call default handler if not prevented in custom handler
-                if (!event.defaultPrevented && utils.is.function(defaultHandler)) {
+                if (returned && utils.is.function(defaultHandler)) {
                     defaultHandler.call(_this4.player, event);
                 }
             };
@@ -10941,8 +10938,6 @@ var youtube = {
                     // Reset timer
                     clearInterval(player.timers.playing);
 
-                    console.warn(event.data);
-
                     // Handle events
                     // -1   Unstarted
                     // 0    Ended
@@ -11595,7 +11590,7 @@ var source = {
 
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.4
+// plyr.js v3.0.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -12154,8 +12149,6 @@ var Plyr$1 = function () {
             // then set the timer to hide the controls
             if (!show || this.playing) {
                 this.timers.controls = setTimeout(function () {
-                    console.warn(_this3.elements.controls.pressed, _this3.elements.controls.hover, delay);
-
                     // If the mouse is over the controls (and not entering fullscreen), bail
                     if ((_this3.elements.controls.pressed || _this3.elements.controls.hover) && !isEnterFullscreen) {
                         return;
@@ -12913,7 +12906,7 @@ var Plyr$1 = function () {
 
 // ==========================================================================
 // Plyr Polyfilled Build
-// plyr.js v3.0.3
+// plyr.js v3.0.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================

package.json

@@ -1,6 +1,6 @@
 {
     "name": "plyr",
-    "version": "3.0.4",
+    "version": "3.0.6",
     "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
     "homepage": "https://plyr.io",
     "main": "./dist/plyr.js",

readme.md

@@ -128,7 +128,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.4/plyr.js"></script>
+<script src="https://cdn.plyr.io/3.0.6/plyr.js"></script>
 ```
 
 _Note_: Be sure to read the [polyfills](#polyfills) section below about browser compatibility
@@ -144,13 +144,13 @@ 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.4/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/3.0.6/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.4/plyr.svg`.
+reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.0.6/plyr.svg`.
 
 ## Ads
 

src/js/defaults.js

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

src/js/fullscreen.js

@@ -164,8 +164,6 @@ class Fullscreen {
             return;
         }
 
-        console.warn(this.prefix);
-
         // iOS native fullscreen doesn't need the request step
         if (browser.isIos && this.player.config.fullscreen.iosNative) {
             if (this.player.playing) {
@@ -202,8 +200,6 @@ class Fullscreen {
 
     // Toggle state
     toggle() {
-        console.warn('TOGGLE');
-
         if (!this.active) {
             this.enter();
         } else {

src/js/listeners.js

@@ -398,14 +398,15 @@ class Listeners {
         const proxy = (event, defaultHandler, customHandlerKey) => {
             const customHandler = this.player.config.listeners[customHandlerKey];
             const hasCustomHandler = utils.is.function(customHandler);
+            let returned = true;
 
             // Execute custom handler
             if (hasCustomHandler) {
-                customHandler.call(this.player, event);
+                returned = customHandler.call(this.player, event);
             }
 
             // Only call default handler if not prevented in custom handler
-            if (!event.defaultPrevented && utils.is.function(defaultHandler)) {
+            if (returned && utils.is.function(defaultHandler)) {
                 defaultHandler.call(this.player, event);
             }
         };

src/js/plugins/youtube.js

@@ -339,8 +339,6 @@ const youtube = {
                     // Reset timer
                     clearInterval(player.timers.playing);
 
-                    console.warn(event.data);
-
                     // Handle events
                     // -1   Unstarted
                     // 0    Ended

src/js/plyr.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v3.0.4
+// plyr.js v3.0.6
 // https://github.com/sampotts/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@@ -1019,8 +1019,6 @@ class Plyr {
         // then set the timer to hide the controls
         if (!show || this.playing) {
             this.timers.controls = setTimeout(() => {
-                console.warn(this.elements.controls.pressed, this.elements.controls.hover, delay);
-
                 // If the mouse is over the controls (and not entering fullscreen), bail
                 if ((this.elements.controls.pressed || this.elements.controls.hover) && !isEnterFullscreen) {
                     return;

src/js/plyr.polyfilled.js

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