Merge branch 'master' of https://github.com/Selz/plyr

Fix for seek issues introduced in v1.8.9
Update readme.md
2016-07-21 21:59:26 +10:00 · 2016-07-21 21:59:16 +10:00 · 2016-07-21 21:32:56 +10:00 · 2016-07-21 21:31:09 +10:00 · 2016-07-21 21:25:27 +10:00 · 2016-07-21 21:21:10 +10:00
8 changed files with 94 additions and 53 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,14 @@
 # Changelog
 ## v1.8.10
 - Fix for seek issues introduced in v1.8.9
 ## v1.8.9
 - Fix for fullscreen not being defined (Fixes #295)
 - Fix for multiline captions (Fixes #314)
 - Clean up of type checks and fix for `restart()` (Fixes #315)
 - Fix for `MEDIA_ERR_SRC_NOT_SUPPORTED` when calling `.source()` API method
 ## v1.8.8
 - Added getCurrentTime API method (fixes #292)
 - Fix for !hideControls on touch devices (fixes #303)
--- a/dist/plyr.css
+++ b/dist/plyr.css
--- a/dist/plyr.js
+++ b/dist/plyr.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "1.8.8",
+  "version": "1.8.10",
  "description": "A simple, accessible and customizable HTML5, YouTube and Vimeo media player",
  "homepage": "http://plyr.io",
  "main": "src/js/plyr.js",
--- a/readme.md
+++ b/readme.md
@ -3,7 +3,7 @@ A simple, accessible and customizable HTML5, YouTube and Vimeo media player.
 [Checkout the demo](https://plyr.io)
-[![Image of Plyr](https://cdn.selz.com/plyr/plyr_v1.8.png)](https://plyr.io)
+[![Image of Plyr](https://cdn.selz.com/plyr/plyr_v1.8.9.png)](https://plyr.io)
 ## Why?
 We wanted a lightweight, accessible and customizable media player that supports [*modern*](#browser-support) browsers. Sure, there are many other players out there but we wanted to keep things simple, using the right elements for the job.
@ -21,8 +21,8 @@ We wanted a lightweight, accessible and customizable media player that supports
 - **[Fullscreen](#fullscreen)** - supports native fullscreen with fallback to "full window" modes
 - **i18n support** - support for internationalization of controls
 - **No dependencies** - written in "vanilla" JavaScript, no jQuery required
- **SASS and LESS provided** - If you like _these_ over plain CSS
+- **SASS and LESS source** - to include in your build process
- **[Streaming](#streaming)** - Support for hls.js, Shaka and dash.js streaming playback
+- **[Streaming](#streaming)** - support for hls.js, Shaka and dash.js streaming playback
 Oh and yes, it works with Bootstrap.
@ -47,6 +47,9 @@ Created and maintained by Ryan Anthony Drake ([@iamryandrake](https://github.com
 ### [Neos](https://packagist.org/packages/jonnitto/plyr)
 Created and maintained by Jon Uhlmann ([@jonnitto](https://github.com/jonnitto))
 ### [Kirby](https://github.com/dpschen/kirby-plyrtag)
 Created and maintained by Dominik Pschenitschni ([@dpschen](https://github.com/dpschen))
 ## Using package managers
 You can grab the source using one of the following package managers.
@ -118,7 +121,7 @@ Include the `plyr.js` script before the closing `</body>` tag and then call `ply
 If you want to use our CDN for the JavaScript, you can use the following:
 ```html
-<script src="https://cdn.plyr.io/1.8.8/plyr.js"></script>
+<script src="https://cdn.plyr.io/1.8.10/plyr.js"></script>
 ```
 ### CSS
@ -131,11 +134,11 @@ Include the `plyr.css` stylsheet into your `<head>`
 If you want to use our CDN for the default CSS, you can use the following:
 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/1.8.8/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/1.8.10/plyr.css">
 ```
 ### SVG Sprite
-The SVG sprite is loaded automatically from our CDN. To change this, see the [#options](Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/1.8.8/plyr.svg`.
+The SVG sprite is loaded automatically from our CDN. To change this, see the [#options](Options) below. For reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/1.8.10/plyr.svg`.
 ## Advanced
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.8.8
+// plyr.js v1.8.10
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@ -44,7 +44,7 @@
        displayDuration:        true,
        loadSprite:             true,
        iconPrefix:             'plyr',
-        iconUrl:                'https://cdn.plyr.io/1.8.8/plyr.svg',
+        iconUrl:                'https://cdn.plyr.io/1.8.10/plyr.svg',
        clickToPlay:            true,
        hideControls:           true,
        showPosterOnEnd:        false,
@ -376,7 +376,7 @@
    // Set attributes
    function _setAttributes(element, attributes) {
        for (var key in attributes) {
-            element.setAttribute(key, (typeof attributes[key] === 'boolean' && attributes[key]) ? '' : attributes[key]);
+            element.setAttribute(key, (_is.boolean(attributes[key]) && attributes[key]) ? '' : attributes[key]);
        }
    }
@ -464,7 +464,7 @@
        // Whether the listener is a capturing listener or not
        // Default to false
-        if (typeof useCapture !== 'boolean') {
+        if (!_is.boolean(useCapture)) {
            useCapture = false;
        }
@ -492,7 +492,7 @@
        }
        // Default bubbles to false
-        if (typeof bubbles !== 'boolean') {
+        if (!_is.boolean(bubbles)) {
            bubbles = false;
        }
@ -515,7 +515,7 @@
        }
        // Get state
-        state = (typeof state === 'boolean' ? state : !target.getAttribute('aria-pressed'));
+        state = (_is.boolean(state) ? state : !target.getAttribute('aria-pressed'));
        // Set the attribute on target
        target.setAttribute('aria-pressed', state);
@ -570,6 +570,28 @@
        return destination;
    }
    // Check variable types
    var _is = {
        object: function(input) {
            return input !== null && typeof(input) === 'object'; 
        },
        array: function(input) {
            return input !== null && typeof(input) === 'object' && input.constructor === Array;
        },
        number: function(input) {
            return typeof(input) === 'number' && !isNaN(input - 0) || (typeof input == 'object' && input.constructor === Number);
        },
        string: function(input) {
            return typeof input === 'string' || (typeof input == 'object' && input.constructor === String);
        },
        boolean: function(input) {
            return typeof input === 'boolean';
        },
        undefined: function(input) {
            return typeof input === 'undefined';
        }
    };
    // Fullscreen API
    function _fullscreen() {
        var fullscreen = {
@ -584,7 +606,7 @@
            browserPrefixes = 'webkit moz o ms khtml'.split(' ');
        // Check for native support
-        if (typeof document.cancelFullScreen !== 'undefined') {
+        if (!_is.undefined(document.cancelFullScreen)) {
            fullscreen.supportsFullScreen = true;
        }
        else {
@ -592,12 +614,12 @@
            for (var i = 0, il = browserPrefixes.length; i < il; i++ ) {
                fullscreen.prefix = browserPrefixes[i];
-                if (typeof document[fullscreen.prefix + 'CancelFullScreen'] !== 'undefined') {
+                if (!_is.undefined(document[fullscreen.prefix + 'CancelFullScreen'])) {
                    fullscreen.supportsFullScreen = true;
                    break;
                }
                // Special case for MS (when isn't it?)
-                else if (typeof document.msExitFullscreen !== 'undefined' && document.msFullscreenEnabled) {
+                else if (!_is.undefined(document.msExitFullscreen) && document.msFullscreenEnabled) {
                    fullscreen.prefix = 'ms';
                    fullscreen.supportsFullScreen = true;
                    break;
@ -612,7 +634,7 @@
            fullscreen.fullScreenEventName = (fullscreen.prefix == 'ms' ? 'MSFullscreenChange' : fullscreen.prefix + 'fullscreenchange');
            fullscreen.isFullScreen = function(element) {
-                if (typeof element === 'undefined') {
+                if (_is.undefined(element)) {
                    element = document.body;
                }
                switch (this.prefix) {
@ -625,7 +647,7 @@
                }
            };
            fullscreen.requestFullScreen = function(element) {
-                if (typeof element === 'undefined') {
+                if (_is.undefined(element)) {
                    element = document.body;
                }
                return (this.prefix === '') ? element.requestFullScreen() : element[this.prefix + (this.prefix == 'ms' ? 'RequestFullscreen' : 'RequestFullScreen')]();
@ -878,7 +900,9 @@
                }
                // Toggle state
-                _toggleState(plyr.buttons.fullscreen, false);
+                if (plyr.buttons && plyr.buttons.fullscreen) {
                    _toggleState(plyr.buttons.fullscreen, false);
                }
                // Setup focus trap
                _focusTrap();
@ -1041,12 +1065,12 @@
            container.innerHTML = '';
            // Default to empty
-            if (typeof caption === 'undefined') {
+            if (_is.undefined(caption)) {
                caption = '';
            }
            // Set the span content
-            if (typeof caption === 'string') {
+            if (_is.undefined(caption)) {
                content.innerHTML = caption.trim();
            }
            else {
@ -1106,7 +1130,7 @@
            // Check time is a number, if not use currentTime
            // IE has a bug where currentTime doesn't go to 0
            // https://twitter.com/Sam_Potts/status/573715746506731521
-            time = typeof time === 'number' ? time : plyr.media.currentTime;
+            time = _is.number(time) ? time : plyr.media.currentTime;
            // If there's no subs available, bail
            if (!plyr.captions[plyr.subcount]) {
@ -1197,7 +1221,7 @@
        // Add elements to HTML5 media (source, tracks, etc)
        function _insertChildElements(type, attributes) {
-            if (typeof attributes === 'string') {
+            if (_is.string(attributes)) {
               _insertElement(type, plyr.media, { src: attributes });
            }
            else if (attributes.constructor === Array) {
@ -1247,7 +1271,7 @@
            if (config.selectors.controls.container !== null) {
                container = config.selectors.controls.container;
-                if (typeof selector === 'string') {
+                if (_is.string(selector)) {
                    container = document.querySelector(container);
                }
            }
@ -1350,7 +1374,7 @@
            var label = config.i18n.play;
            // If there's a media title set, use that for the label
-            if (typeof(config.title) !== 'undefined' && config.title.length) {
+            if (!_is.undefined(config.title) && config.title.length) {
                label += ', ' + config.title;
            }
@ -1443,7 +1467,7 @@
                container.setAttribute('id', id);
                // Setup API
-                if (typeof YT === 'object') {
+                if (_is.object(YT)) {
                    _youTubeReady(mediaId, container);
                }
                else {
@ -1878,7 +1902,7 @@
        // Rewind
        function _rewind(seekTime) {
            // Use default if needed
-            if (typeof seekTime !== 'number') {
+            if (!_is.number(seekTime)) {
                seekTime = config.seekTime;
            }
            _seek(plyr.media.currentTime - seekTime);
@ -1887,7 +1911,7 @@
        // Fast forward
        function _forward(seekTime) {
            // Use default if needed
-            if (typeof seekTime !== 'number') {
+            if (!_is.number(seekTime)) {
                seekTime = config.seekTime;
            }
            _seek(plyr.media.currentTime + seekTime);
@ -1901,11 +1925,11 @@
                duration    = _getDuration();
            // Explicit position
-            if (typeof input === 'number') {
+            if (_is.number(input)) {
                targetTime = input;
            }
            // Event
-            else if (input.type && _inArray(['input', 'change'], input.type)) {
+            else if (_is.object(input) && _inArray(['input', 'change'], input.type)) {
                // It's the seek slider
                // Seek to the selected time
                targetTime = ((input.target.value / input.target.max) * duration);
@ -2060,7 +2084,9 @@
            _focusTrap(plyr.isFullscreen);
            // Set button state
-            _toggleState(plyr.buttons.fullscreen, plyr.isFullscreen);
+            if (plyr.buttons && plyr.buttons.fullscreen) {
                _toggleState(plyr.buttons.fullscreen, plyr.isFullscreen);
            }
            // Trigger an event
            _triggerEvent(plyr.container, plyr.isFullscreen ? 'enterfullscreen' : 'exitfullscreen', true);
@ -2082,7 +2108,7 @@
        // Mute
        function _toggleMute(muted) {
            // If the method is called without parameter, toggle based on current value
-            if (typeof muted !== 'boolean') {
+            if (!_is.boolean(muted)) {
                muted = !plyr.media.muted;
            }
@ -2125,7 +2151,7 @@
                min = config.volumeMin;
            // Use default if no value specified
-            if (typeof volume === 'undefined') {
+            if (_is.undefined(volume)) {
                volume = config.volume;
                if (config.storage.enabled && _storage().supported) {
@ -2237,7 +2263,7 @@
            }
            // If the method is called without parameter, toggle based on current value
-            if (typeof show !== 'boolean') {
+            if (!_is.boolean(show)) {
                show = (plyr.container.className.indexOf(config.classes.captions.active) === -1);
            }
@ -2307,7 +2333,7 @@
                                return _getPercentage(buffered.end(0), duration);
                            }
                            // YouTube returns between 0 and 1
-                            else if (typeof buffered === 'number') {
+                            else if (_is.number(buffered)) {
                                return (buffered * 100);
                            }
@ -2329,11 +2355,11 @@
            }
            // Default to 0
-            if (typeof value === 'undefined') {
+            if (_is.undefined(value)) {
                value = 0;
            }
            // Default to buffer or bail
-            if (typeof progress === 'undefined') {
+            if (_is.undefined(progress)) {
                if (plyr.progress && plyr.progress.buffer) {
                    progress = plyr.progress.buffer;
                }
@ -2424,7 +2450,7 @@
        // Update seek range and progress 
        function _updateSeekDisplay(time) {
            // Default to 0
-            if (typeof time !== 'number') {
+            if (!_is.number(time)) {
                time = 0;
            }
@ -2501,7 +2527,7 @@
                show = toggle;
            // Default to false if no boolean
-            if (typeof toggle !== 'boolean') {
+            if (!_is.boolean(toggle)) {
                if (toggle && toggle.type) {
                    // Is the enter fullscreen event
                    isEnterFullscreen = (toggle.type === 'enterfullscreen');
@ -2559,7 +2585,7 @@
        // Add common function to retrieve media source
        function _source(source) {
            // If not null or undefined, parse it
-            if (typeof source !== 'undefined') {
+            if (!_is.undefined(source)) {
                _updateSource(source);
                return;
            }
@ -2594,7 +2620,7 @@
        // Update source
        // Sources are not checked for support so be careful
        function _updateSource(source) {
-            if (typeof source === 'undefined' || !('sources' in source) || !source.sources.length) {
+            if (!_is.object(source) || !('sources' in source) || !source.sources.length) {
                _warn('Invalid source format');
                return;
            }
@ -2671,7 +2697,7 @@
            _prependChild(plyr.container, plyr.media);
            // Autoplay the new source?
-            if (typeof source.autoplay !== 'undefined') {
+            if (_is.boolean(source.autoplay)) {
                config.autoplay = source.autoplay;
            }
@ -3023,9 +3049,8 @@
            // Set blank video src attribute
            // This is to prevent a MEDIA_ERR_SRC_NOT_SUPPORTED error
            // Small mp4: https://github.com/mathiasbynens/small/blob/master/mp4.mp4
            // Info: http://stackoverflow.com/questions/32231579/how-to-properly-dispose-of-an-html5-video-and-close-socket-or-connection
-            plyr.media.setAttribute('src', 'data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAAGm1kYXQAAAGzABAHAAABthBgUYI9t+8AAAMNbW9vdgAAAGxtdmhkAAAAAMXMvvrFzL76AAAD6AAAACoAAQAAAQAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAABhpb2RzAAAAABCAgIAHAE/////+/wAAAiF0cmFrAAAAXHRraGQAAAAPxcy++sXMvvoAAAABAAAAAAAAACoAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAgAAAAIAAAAAAG9bWRpYQAAACBtZGhkAAAAAMXMvvrFzL76AAAAGAAAAAEVxwAAAAAALWhkbHIAAAAAAAAAAHZpZGUAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAABaG1pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAShzdGJsAAAAxHN0c2QAAAAAAAAAAQAAALRtcDR2AAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAgACABIAAAASAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAAXmVzZHMAAAAAA4CAgE0AAQAEgICAPyARAAAAAAMNQAAAAAAFgICALQAAAbABAAABtYkTAAABAAAAASAAxI2IAMUARAEUQwAAAbJMYXZjNTMuMzUuMAaAgIABAgAAABhzdHRzAAAAAAAAAAEAAAABAAAAAQAAABxzdHNjAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAUc3RzegAAAAAAAAASAAAAAQAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYHVkdGEAAABYbWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAraWxzdAAAACOpdG9vAAAAG2RhdGEAAAABAAAAAExhdmY1My4yMS4x');
+            plyr.media.setAttribute('src', 'https://cdn.selz.com/plyr/blank.mp4');
            // Load the new empty source
            // This will cancel existing requests
@ -3274,7 +3299,7 @@
        var x = new XMLHttpRequest();
        // If the id is set and sprite exists, bail
-        if (typeof id === 'string' && document.querySelector('#' + id) !== null) {
+        if (_is.string(id) && document.querySelector('#' + id) !== null) {
            return;
        }
@ -3290,7 +3315,7 @@
        x.onload = function() {
            var c = document.createElement('div');
            c.setAttribute('hidden', '');
-            if (typeof id === 'string') {
+            if (_is.string(id)) {
                c.setAttribute('id', id);
            }
            c.innerHTML = x.responseText;
@ -3348,7 +3373,7 @@
        // Select the elements
        // Assume elements is a NodeList by default
-        if (typeof targets === 'string') {
+        if (_is.string(targets)) {
            targets = document.querySelectorAll(targets);
        }
        // Single HTMLElement passed
@ -3356,9 +3381,9 @@
            targets = [targets];
        }
        // No selector passed, possibly options as first argument
-        else if (!(targets instanceof NodeList) && typeof targets !== 'string')  {
+        else if (!(targets instanceof NodeList) && !_is.string(targets))  {
            // If options are the first argument
-            if (typeof options === 'undefined' && typeof targets === 'object') {
+            if (_is.undefined(options) && _is.object(targets)) {
                options = targets;
            }
@ -3452,7 +3477,7 @@
 // https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent/CustomEvent
 (function () {
    if (typeof window.CustomEvent === 'function') {
-        return false;
+        return;
    }
    function CustomEvent(event, params) {
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@ -225,6 +225,8 @@
        border-radius: 2px;
        padding: floor(@plyr-control-spacing / 3) @plyr-control-spacing;
        background: @plyr-captions-bg;
        box-decoration-break: clone;
        line-height: 150%;
    }
    span:empty {
        display: none;
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@ -225,6 +225,8 @@
        border-radius: 2px;
        padding: floor($plyr-control-spacing / 3) $plyr-control-spacing;
        background: $plyr-captions-bg;
        box-decoration-break: clone;
        line-height: 150%;
    }
    span:empty {
        display: none;
Author	SHA1	Message	Date
Sam Potts	6ff1e47341	Merge branch 'master' of https://github.com/Selz/plyr	2016-07-21 21:59:26 +10:00
Sam Potts	e72a91de6e	Fix for seek issues introduced in v1.8.9	2016-07-21 21:59:16 +10:00
Sam Potts	52ec4c012d	Update readme.md	2016-07-21 21:32:56 +10:00
Sam Potts	ae89c92ab6	Update readme.md	2016-07-21 21:31:09 +10:00
Sam Potts	57ad124ce8	v1.8.9	2016-07-21 21:25:27 +10:00
Sam Potts	a85d45d2e5	Fix for fullscreen not being defined (Fixes #295 )	2016-07-21 21:21:10 +10:00
Sam Potts	a6f57fc034	Fix for multiline captions (Fixes #314 )	2016-07-21 21:15:44 +10:00
Sam Potts	04c9653b86	Merge branch 'master' of https://github.com/Selz/plyr	2016-07-21 21:14:29 +10:00
Sam Potts	b8cdc71001	Clean up of type checks and fix for _restart() (Fixes #315 )	2016-07-21 21:14:22 +10:00
Sam Potts	277ebf0fd1	Merge pull request #312 from dpschen/patch-1 Add kirby-plyrtag	2016-07-14 22:03:50 +10:00
Dominik Pschenitschni	7682d998e7	Add kirby-plyrtag Added a Kirby cms kirbytag https://getkirby.com/	2016-07-14 12:52:28 +02:00
Sam Potts	05b9b9a831	Fix for MEDIA_ERR_SRC_NOT_SUPPORTED when calling .source() API method	2016-07-14 17:13:37 +10:00