Fixed AMD definition

Vimeo IE9/10 (Fixes #348 ), HTML5 ready event (Fixes #349 )
Fix for Firefox full screen (fixes #343 )
2016-08-26 21:43:51 +10:00 · 2016-08-26 18:15:24 +10:00 · 2016-08-23 00:34:43 +10:00 · 2016-08-22 20:41:49 +10:00 · 2016-08-22 14:44:18 +10:00
7 changed files with 130 additions and 183 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,10 +1,24 @@
 # Changelog
-# v2.0.2
+## v2.0.6
 - Fixed merge issue with `Updated define to work with AMD imports #326` PR
 - Code formatting 
 ## v2.0.5
 - Fix for Vimeo in IE9 & IE10 
 - Fix for HTML5 elements not firing `ready` event
 ## v2.0.4
 - Fix for Firefox full screen (fixes #343)
 ## v2.0.3
 - Set 'global' keyboard shortcut option to false as default, added `<textarea>` to editable elements to be ignored
 ## v2.0.2
 - Added 'global' keyboard shortcut option
-# v2.0.1
+## v2.0.1
- Version bump for NPM
+- Version bump for NPM (sorry for folks who upgraded to the now deleted v1.9.0 through NPM)
 # v2.0.0
 This version contains several potential ***breaking changes***:
--- a/demo/dist/demo.css
+++ b/demo/dist/demo.css
--- 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": "2.0.2",
+  "version": "2.0.6",
  "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
@ -122,7 +122,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/2.0.2/plyr.js"></script>
+<script src="https://cdn.plyr.io/2.0.6/plyr.js"></script>
 ```
 ### CSS
@ -135,11 +135,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/2.0.2/plyr.css">
+<link rel="stylesheet" href="https://cdn.plyr.io/2.0.6/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/2.0.2/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/2.0.6/plyr.svg`.
 ## Advanced
@ -322,8 +322,8 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke
    <tr>
      <td><code>keyboardShortcuts</code></td>
      <td>Object</td>
-      <td><code>{ focused: true, global: true }</code></td>
+      <td><code>{ focused: true, global: false }</code></td>
-      <td>Enable <a href="#shortcuts">keyboard shortcuts</a> for focused players only or global as well (if there's only one player in the document)</td>
+      <td>Enable <a href="#shortcuts">keyboard shortcuts</a> for focused players only or globally as well (this will only work if there's one player in the document)</td>
    </tr>
    <tr>
      <td><code>tooltips</code></td>
@ -487,7 +487,7 @@ Here's a list of the methods supported:
  <tr>
    <td><code>isReady()</code></td>
    <td>&mdash;</td>
-    <td>Determine if the player is loaded and UI ready - this is because HTML5 is ready instantly but YouTube and Vimeo can take some time to load their APIs.</td>
+    <td>Determine if the player is loaded and UI ready.</td>
  </tr>
  <tr>
    <td><code>on()</code></td>
@ -736,7 +736,7 @@ These events also bubble up the DOM. The event target will be the container elem
    <tr>
      <td><code>ready</code></td>
      <td></td>
-      <td>Triggered when the instance is ready for API use and external APIs are ready (YouTube and Vimeo).</td>
+      <td>Triggered when the instance is ready for API use and external APIs are ready (in the case of YouTube and Vimeo).</td>
    </tr>
  	<tr>
  		<td><code>canplay</code></td>
@ -873,7 +873,7 @@ More info on the respective API's here:
 *Please note*: not all API methods may work 100%. Your mileage may vary. It's better to use the universal plyr API where possible.
 ## Shortcuts
-By default, a player will bind the following keyboard shortcuts when it has focus. If you have the `global` option to `true` and there's only one player in the document then the shortcuts will work when any element has focus, apart from an element that requires input (such as an `<input>`, `<select>` or `[contenteditable]`). 
+By default, a player will bind the following keyboard shortcuts when it has focus. If you have the `global` option to `true` and there's only one player in the document then the shortcuts will work when any element has focus, apart from an element that requires input. 
 <table class="table" width="100%">
  <thead>
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v2.0.2
+// plyr.js v2.0.6
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@ -16,7 +16,7 @@
        module.exports = factory(root, document);
    } else if (typeof define === 'function' && define.amd) {
        // AMD
-        define(null, function() { factory(root, document) });
+        define([], function () { return factory(root, document); });
    } else {
        // Browser globals (root is window)
        root.plyr = factory(root, document);
@ -43,14 +43,14 @@
        displayDuration:        true,
        loadSprite:             true,
        iconPrefix:             'plyr',
-        iconUrl:                'https://cdn.plyr.io/2.0.2/plyr.svg',
+        iconUrl:                'https://cdn.plyr.io/2.0.6/plyr.svg',
        clickToPlay:            true,
        hideControls:           true,
        showPosterOnEnd:        false,
        disableContextMenu:     true,
        keyboardShorcuts:       {
            focused:            true,
-            global:             true
+            global:             false
        },
        tooltips: {
            controls:           false,
@ -59,7 +59,7 @@
        selectors: {
            html5:              'video, audio',
            embed:              '[data-type]',
-            editable:           'input, select, [contenteditable]',
+            editable:           'input, textarea, select, [contenteditable]',
            container:          '.plyr',
            controls: {
                container:      null,
@ -175,7 +175,7 @@
            fullscreen:         null
        },
        // Events to watch on HTML5 media elements
-        events:                 ['ended', 'progress', 'stalled', 'playing', 'waiting', 'canplay', 'canplaythrough', 'loadstart', 'loadeddata', 'loadedmetadata', 'timeupdate', 'volumechange', 'play', 'pause', 'error', 'seeking', 'emptied'],
+        events:                 ['ready', 'ended', 'progress', 'stalled', 'playing', 'waiting', 'canplay', 'canplaythrough', 'loadstart', 'loadeddata', 'loadedmetadata', 'timeupdate', 'volumechange', 'play', 'pause', 'error', 'seeking', 'emptied'],
        // Logging
        logPrefix:              '[Plyr]'
    };
@ -195,41 +195,36 @@
            isChrome = false,
            isSafari = false;
        // MSIE 11
        if ((navigator.appVersion.indexOf('Windows NT') !== -1) && (navigator.appVersion.indexOf('rv:11') !== -1)) {
            // MSIE 11
            isIE = true;
            name = 'IE';
            fullVersion = '11';
-        }
+        } else if ((verOffset = ua.indexOf('MSIE')) !== -1) {
-        // MSIE
+            // MSIE
        else if ((verOffset = ua.indexOf('MSIE')) !== -1) {
            isIE = true;
            name = 'IE';
            fullVersion = ua.substring(verOffset + 5);
-        }
+        } else if ((verOffset = ua.indexOf('Chrome')) !== -1) {
-        // Chrome
+            // Chrome
        else if ((verOffset = ua.indexOf('Chrome')) !== -1) {
            isChrome = true;
            name = 'Chrome';
            fullVersion = ua.substring(verOffset + 7);
-        }
+        } else if ((verOffset = ua.indexOf('Safari')) !== -1) {
-        // Safari
+            // Safari
        else if ((verOffset = ua.indexOf('Safari')) !== -1) {
            isSafari = true;
            name = 'Safari';
            fullVersion = ua.substring(verOffset + 7);
            if ((verOffset = ua.indexOf('Version')) !== -1) {
                fullVersion = ua.substring(verOffset + 8);
            }
-        }
+        } else if ((verOffset = ua.indexOf('Firefox')) !== -1) {
-        // Firefox
+            // Firefox
        else if ((verOffset = ua.indexOf('Firefox')) !== -1) {
            isFirefox = true;
            name = 'Firefox';
            fullVersion = ua.substring(verOffset + 8);
-        }
+        } else if ((nameOffset = ua.lastIndexOf(' ') + 1) < (verOffset = ua.lastIndexOf('/'))) {
-        // In most other browsers, 'name/version' is at the end of userAgent
+            // In most other browsers, 'name/version' is at the end of userAgent
        else if ((nameOffset = ua.lastIndexOf(' ') + 1) < (verOffset = ua.lastIndexOf('/'))) {
            name = ua.substring(nameOffset,verOffset);
            fullVersion = ua.substring(verOffset + 1);
@ -272,7 +267,6 @@
    function _supportMime(plyr, mimeType) {
        var media = plyr.media;
        // Only check video types for video players
        if (plyr.type === 'video') {
            // Check type
            switch (mimeType) {
@ -280,10 +274,7 @@
                case 'video/mp4':    return !!(media.canPlayType && media.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
                case 'video/ogg':    return !!(media.canPlayType && media.canPlayType('video/ogg; codecs="theora"').replace(/no/, ''));
            }
-        }
+        } else if (plyr.type === 'audio') {
        // Only check audio types for audio players
        else if (plyr.type === 'audio') {
            // Check type
            switch (mimeType) {
                case 'audio/mpeg':   return !!(media.canPlayType && media.canPlayType('audio/mpeg;').replace(/no/, ''));
@ -344,8 +335,7 @@
            // append it to the parent.
            if (sibling) {
                parent.insertBefore(child, sibling);
-            }
+            } else {
            else {
                parent.appendChild(child);
            }
@ -410,8 +400,7 @@
        if (element) {
            if (element.classList) {
                element.classList[state ? 'add' : 'remove'](className);
-            }
+            } else {
            else {
                var name = (' ' + element.className + ' ').replace(/\s+/g, ' ').replace(' ' + className + ' ', '');
                element.className = name + (state ? ' ' + className : '');
            }
@ -423,8 +412,7 @@
        if (element) {
            if (element.classList) {
                return element.classList.contains(className);
-            }
+            } else {
            else {
                return new RegExp('(\\s|^)' + className + '(\\s|$)').test(element.className);
            }
        }
@ -568,8 +556,7 @@
                if (source[property] && source[property].constructor && source[property].constructor === Object) {
                    destination[property] = destination[property] || {};
                    _extend(destination[property], source[property]);
-                }
+                } else {
                else {
                    destination[property] = source[property];
                }
            }
@ -620,13 +607,12 @@
                element: null,
                prefix: ''
            },
-            browserPrefixes = 'webkit o ms khtml'.split(' ');
+            browserPrefixes = 'webkit o moz ms khtml'.split(' ');
        // Check for native support
        if (!_is.undefined(document.cancelFullScreen)) {
            fullscreen.supportsFullScreen = true;
-        }
+        } else {
        else {
            // Check for fullscreen support by vendor prefix
            for (var i = 0, il = browserPrefixes.length; i < il; i++ ) {
                fullscreen.prefix = browserPrefixes[i];
@ -634,9 +620,8 @@
                if (!_is.undefined(document[fullscreen.prefix + 'CancelFullScreen'])) {
                    fullscreen.supportsFullScreen = true;
                    break;
-                }
+                } else if (!_is.undefined(document.msExitFullscreen) && document.msFullscreenEnabled) {
-                // Special case for MS (when isn't it?)
+                    // Special case for MS (when isn't it?)
                else if (!_is.undefined(document.msExitFullscreen) && document.msFullscreenEnabled) {
                    fullscreen.prefix = 'ms';
                    fullscreen.supportsFullScreen = true;
                    break;
@ -657,6 +642,8 @@
                switch (this.prefix) {
                    case '':
                        return document.fullscreenElement === element;
                    case 'moz':
                        return document.mozFullScreenElement === element;
                    default:
                        return document[this.prefix + 'FullscreenElement'] === element;
                }
@ -920,8 +907,7 @@
                    // Add styling hook
                    _toggleClass(plyr.container, config.classes.fullscreen.enabled, true);
-                }
+                } else {
                else {
                    _log('Fullscreen not supported and fallback disabled');
                }
@ -972,17 +958,14 @@
            if (captionSrc === '') {
                plyr.captionExists = false;
                _log('No caption track found');
-            }
+            } else {
            else {
                _log('Caption track found; URI: ' + captionSrc);
            }
            // If no caption file exists, hide container for caption text
            if (!plyr.captionExists) {
                _toggleClass(plyr.container, config.classes.captions.enabled);
-            }
+            } else {
            // If caption file exists, process captions
            else {
                // Turn off native caption rendering to avoid double captions
                // This doesn't seem to work in Safari 7+, so the <track> elements are removed from the dom below
                var tracks = plyr.media.textTracks;
@ -1018,16 +1001,14 @@
                                // Display a cue, if there is one
                                if (this.activeCues[0] && 'text' in this.activeCues[0]) {
                                    _setCaption(this.activeCues[0].getCueAsHTML());
-                                }
+                                } else {
                                else {
                                    _setCaption();
                                }
                            });
                        }
                    }
-                }
+                } else {
-                // Caption tracks not natively supported
+                    // Caption tracks not natively supported
                else {
                    _log('TextTracks not supported so rendering captions manually');
                    // Render captions from array at appropriate time
@ -1067,8 +1048,7 @@
                                    plyr.captions.shift();
                                    _log('Successfully loaded the caption file via AJAX');
-                                }
+                                } else {
                                else {
                                    _warn(config.logPrefix + 'There was a problem loading the caption file via AJAX');
                                }
                            }
@ -1099,8 +1079,7 @@
            // Set the span content
            if (_is.string(caption)) {
                content.innerHTML = caption.trim();
-            }
+            } else {
            else {
                content.appendChild(caption);
            }
@ -1134,8 +1113,7 @@
            function _subTcSecs(tc) {
                if (tc === null || tc === undefined) {
                    return 0;
-                }
+                } else {
                else {
                    var tc1 = [],
                        tc2 = [],
                        seconds;
@ -1179,8 +1157,7 @@
                // Render the caption
                _setCaption(plyr.currentCaption);
-            }
+            } else {
            else {
                _setCaption();
            }
        }
@ -1237,13 +1214,12 @@
            function _checkFocus(event) {
                // If it is TAB
                if (event.which === 9 && plyr.isFullscreen) {
                    // Move focus to first element that can be tabbed if Shift isn't used
                    if (event.target === last && !event.shiftKey) {
                        // Move focus to first element that can be tabbed if Shift isn't used
                        event.preventDefault();
                        first.focus();
-                    }
+                    } else if (event.target === first && event.shiftKey) {
-                    // Move focus to last element that can be tabbed if Shift is used
+                        // Move focus to last element that can be tabbed if Shift is used
                    else if (event.target === first && event.shiftKey) {
                        event.preventDefault();
                        last.focus();
                    }
@ -1258,8 +1234,7 @@
        function _insertChildElements(type, attributes) {
            if (_is.string(attributes)) {
               _insertElement(type, plyr.media, { src: attributes });
-            }
+            } else if (attributes.constructor === Array) {
            else if (attributes.constructor === Array) {
                for (var i = attributes.length - 1; i >= 0; i--) {
                    _insertElement(type, plyr.media, attributes[i]);
                }
@ -1276,8 +1251,7 @@
                if (iconUrl.absolute) {
                    _log('AJAX loading absolute SVG sprite' + (plyr.browser.isIE ? ' (due to IE)' : ''));
                    loadSprite(iconUrl.url, "sprite-plyr");
-                }
+                } else {
                else {
                    _log('Sprite will be used as external resource directly');
                }
            }
@ -1393,8 +1367,7 @@
        function _toggleNativeControls(toggle) {
            if (toggle && _inArray(config.types.html5, plyr.type)) {
                plyr.media.setAttribute('controls', '');
-            }
+            } else {
            else {
                plyr.media.removeAttribute('controls');
            }
        }
@ -1446,14 +1419,12 @@
            if (!value) {
                // Key wasn't set (or had been cleared), move along
                return;
-            } 
+            } else if (/^\d+(\.\d+)?$/.test(value)) {
            else if (/^\d+(\.\d+)?$/.test(value)) {
                // If value is a number, it's probably volume from an older
                // version of plyr. See: https://github.com/Selz/plyr/pull/313
                // Update the key to be JSON
                _updateStorage({volume: parseFloat(value)});
-            } 
+            } else {
            else {
                // Assume it's JSON from this or a later version of plyr
                plyr.storage = JSON.parse(value);
            }
@ -1536,7 +1507,6 @@
            _toggleClass(plyr.media, config.classes.videoWrapper, true);
            _toggleClass(plyr.media, config.classes.embedWrapper, true);
            // YouTube
            if (plyr.type === 'youtube') {
                // Create the YouTube container
                plyr.media.appendChild(container);
@ -1547,8 +1517,7 @@
                // Setup API
                if (_is.object(window.YT)) {
                    _youTubeReady(mediaId, container);
-                }
+                } else {
                else {
                    // Load the API
                    _injectScript(config.urls.youtube.api);
@ -1563,14 +1532,11 @@
                        window.onYouTubeReadyCallbacks.forEach(function(callback) { callback(); });
                    };
                }
-            }
+            } else if (plyr.type === 'vimeo') {
            // Vimeo
            else if (plyr.type === 'vimeo') {
                // Vimeo needs an extra div to hide controls on desktop (which has full support)
                if (plyr.supported.full) {
                    plyr.media.appendChild(container);
-                }
+                } else {
                else {
                    container = plyr.media;
                }
@ -1588,14 +1554,11 @@
                            _vimeoReady(mediaId, container);
                        }
                    }, 50);
-                }
+                } else {
                else {
                    _vimeoReady(mediaId, container);
                }
-            }
+            } else if (plyr.type === 'soundcloud') {
-            // Soundcloud
+                // TODO: Currently unsupported and undocumented
            // TODO: Currently unsupported and undocumented
            else if (plyr.type === 'soundcloud') {
                // Inject the iframe
                var soundCloud = document.createElement('iframe');
@ -1783,8 +1746,8 @@
        function _vimeoReady(mediaId, container) {
            // Setup instance
            // https://github.com/vimeo/player.js
-            plyr.embed = new window.Vimeo.Player(container.id, {
+            plyr.embed = new window.Vimeo.Player(container, {
-                id:         mediaId,
+                id:         parseInt(mediaId),
                loop:       config.loop,
                autoplay:   config.autoplay,
                byline:     false,
@ -1834,7 +1797,7 @@
            plyr.embed.on('loaded', function() {
                // Fix keyboard focus issues
                // https://github.com/Selz/plyr/issues/317
-                if(_is.htmlElement(plyr.embed.element) && plyr.supported.full) {
+                if (_is.htmlElement(plyr.embed.element) && plyr.supported.full) {
                    plyr.embed.element.setAttribute('tabindex', '-1');
                }
            });
@ -1966,12 +1929,9 @@
                toggle = plyr.media.paused;
            }
            // Play
            if (toggle) {
                _play();
-            }
+            } else {
            // Pause
            else {
                _pause();
            }
@ -2003,12 +1963,9 @@
                paused      = plyr.media.paused,
                duration    = _getDuration();
            // Explicit position
            if (_is.number(input)) {
                targetTime = input;
-            }
+            } else if (_is.object(input) && _inArray(['input', 'change'], input.type)) {
            // Event
            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);
@ -2017,8 +1974,7 @@
            // Normalise targetTime
            if (targetTime < 0) {
                targetTime = 0;
-            }
+            } else if (targetTime > duration) {
            else if (targetTime > duration) {
                targetTime = duration;
            }
@ -2077,7 +2033,7 @@
            mediaDuration = 0;
            // Only if duration available
-            if(plyr.media.duration !== null && !isNaN(plyr.media.duration)) {
+            if (plyr.media.duration !== null && !isNaN(plyr.media.duration)) {
                mediaDuration = plyr.media.duration;
            }
@ -2116,19 +2072,16 @@
                // If it's a fullscreen change event, update the UI
                if (event && event.type === fullscreen.fullScreenEventName) {
                    plyr.isFullscreen = fullscreen.isFullScreen(plyr.container);
-                }
+                } else {
-                // Else it's a user request to enter or exit
+                    // Else it's a user request to enter or exit
                else  {
                    // Request fullscreen
                    if (!fullscreen.isFullScreen(plyr.container)) {
                        // Save scroll position
                        _saveScrollPosition();
                        // Request full screen
                        fullscreen.requestFullScreen(plyr.container);
-                    }
+                    } else {
-                    // Bail from fullscreen
+                        // Bail from fullscreen
                    else {
                        fullscreen.cancelFullScreen();
                    }
@ -2137,8 +2090,7 @@
                    return;
                }
-            }
+            } else {
            else {
                // Otherwise, it's a simple toggle
                plyr.isFullscreen = !plyr.isFullscreen;
@ -2387,12 +2339,11 @@
                        value       = (function() {
                            var buffered = plyr.media.buffered;
                            // HTML5
                            if (buffered && buffered.length) {
                                // HTML5
                                return _getPercentage(buffered.end(0), duration);
-                            }
+                            } else if (_is.number(buffered)) {
-                            // YouTube returns between 0 and 1
+                                // YouTube returns between 0 and 1
                            else if (_is.number(buffered)) {
                                return (buffered * 100);
                            }
@ -2421,8 +2372,7 @@
            if (_is.undefined(progress)) {
                if (plyr.progress && plyr.progress.buffer) {
                    progress = plyr.progress.buffer;
-                }
+                } else {
                else {
                    return;
                }
            }
@ -2430,9 +2380,8 @@
            // One progress element passed
            if (_is.htmlElement(progress)) {
                progress.value = value;
-            }
+            } else if (progress) {
-            // Object of progress + text element
+                // Object of progress + text element
            else if (progress) {
                if (progress.bar) {
                    progress.bar.value = value;
                }
@ -2545,20 +2494,17 @@
            if (!event) {
                if (_hasClass(plyr.progress.tooltip, visible)) {
                    percent = plyr.progress.tooltip.style.left.replace('%', '');
-                }
+                } else {
                else {
                    return;
                }
-            }
+            } else {
            else {
                percent = ((100 / clientRect.width) * (event.pageX - clientRect.left));
            }
            // Set bounds
            if (percent < 0) {
                percent = 0;
-            }
+            } else if (percent > 100) {
            else if (percent > 100) {
                percent = 100;
            }
@ -2605,8 +2551,7 @@
                    if (toggle.type === 'focus') {
                        delay = 3000;
                    }
-                }
+                } else {
                else {
                    show = _hasClass(plyr.container, config.classes.hideControls);
                }
            }
@ -2844,8 +2789,7 @@
                // Get the last play button to account for the large play button
                if (target && target.length > 1) {
                    target = target[target.length - 1];
-                }
+                } else {
                else {
                    target = target[0];
                }
@ -2870,8 +2814,7 @@
                if (!focused || focused === document.body) {
                    focused = null;
-                }
+                } else {
                else {
                    focused = document.querySelector(':focus');
                }
@ -2892,8 +2835,7 @@
                        for (var i = 0; i < element.length; i++) {
                            _toggleClass(element[i], config.classes.tabFocus, (element[i] === focused));
                        }
-                    }
+                    } else {
                    else {
                        _toggleClass(element, config.classes.tabFocus, (element === focused));
                    }
                }
@ -3001,8 +2943,7 @@
                    // Store last code for next cycle
                    last = code;
-                }
+                } else {
                else {
                    last = null;
                }
            }
@ -3099,8 +3040,7 @@
                if (event.deltaY < 0 || event.deltaX > 0) {
                    if (inverted) {
                        _decreaseVolume(step);
-                    }
+                    } else {
                    else {
                        _increaseVolume(step);
                    }
                }
@ -3109,8 +3049,7 @@
                if (event.deltaY > 0 || event.deltaX < 0) {
                    if (inverted) {
                        _increaseVolume(step);
-                    }
+                    } else {
                    else {
                        _decreaseVolume(step);
                    }
                }
@ -3131,7 +3070,7 @@
            // Handle the media finishing
            _on(plyr.media, 'ended', function() {
                // Show poster on end
-                if(plyr.type === 'video' && config.showPosterOnEnd) {
+                if (plyr.type === 'video' && config.showPosterOnEnd) {
                    // Clear
                    if (plyr.type === 'video') {
                        _setCaption();
@ -3179,12 +3118,10 @@
                    if (plyr.media.paused) {
                        _play();
-                    }
+                    } else if (plyr.media.ended) {
                    else if (plyr.media.ended) {
                        _seek();
                        _play();
-                    }
+                    } else {
                    else {
                        _pause();
                    }
                });
@ -3332,8 +3269,7 @@
                // Clean up
                media.removeAttribute('data-type');
                media.removeAttribute('data-video-id');
-            }
+            } else {
            else {
                plyr.type           = tagName;
                config.crossorigin  = (media.getAttribute('crossorigin') !== null);
                config.autoplay     = (config.autoplay || (media.getAttribute('autoplay') !== null));
@ -3471,8 +3407,10 @@
        // Everything done
        function _ready() {
-            // Ready event
+            // Ready event at end of execution stack
-            _triggerEvent(plyr.container, 'ready', true);
+            window.setTimeout(function() { 
                _triggerEvent(plyr.media, 'ready');
            }, 0);
            // Set class hook on media element
            _toggleClass(plyr.media, defaults.classes.setup, true);
@ -3520,8 +3458,7 @@
        // Check for CORS support
        if ('withCredentials' in x) {
            x.open('GET', url, true);
-        }
+        } else {
        else {
            return;
        }
@ -3580,16 +3517,14 @@
            selector    = [defaults.selectors.html5, defaults.selectors.embed].join(',');
        // Select the elements
        // Assume elements is a NodeList by default
        if (_is.string(targets)) {
            // String selector passed
            targets = document.querySelectorAll(targets);
-        }
+        }  else if (_is.htmlElement(targets)) {
-        // Single HTMLElement passed
+            // Single HTMLElement passed
        else if (_is.htmlElement(targets)) {
            targets = [targets];
-        }
+        }  else if (!_is.nodeList(targets) && !_is.array(targets) && !_is.string(targets))  {
-        // No selector passed, possibly options as first argument
+            // No selector passed, possibly options as first argument
        else if (!_is.nodeList(targets) && !_is.array(targets) && !_is.string(targets))  {
            // If options are the first argument
            if (_is.undefined(options) && _is.object(targets)) {
                options = targets;
@ -3636,9 +3571,8 @@
                for (var x = 0; x < children.length; x++) {
                    add(target, children[x]);
                }
-            }
+            } else if (_matches(target, selector)) {
-            // Wrap target if it's a media element
+                // Target is media element
            else if (_matches(target, selector)) {
                add(target, target);
            }
        }
@ -3679,7 +3613,7 @@
            // Listen for events if debugging
            if (config.debug) {
-                var events = config.events.concat(['setup', 'ready', 'statechange', 'enterfullscreen', 'exitfullscreen', 'captionsenabled', 'captionsdisabled']);
+                var events = config.events.concat(['setup', 'statechange', 'enterfullscreen', 'exitfullscreen', 'captionsenabled', 'captionsdisabled']);
                _on(instance.getContainer(), events.join(' '), function(event) { 
                    console.log([config.logPrefix, 'event:', event.type].join(' '), event.detail.plyr);
@ -3700,12 +3634,11 @@
    // Get all instances within a provided container
    function get(container) {
        // Get selector if string passed
        if (_is.string(container)) {
            // Get selector if string passed
            container = document.querySelector(container);
-        }
+        } else if (_is.undefined(container)) {
-        // Use body by default to get all on page
+            // Use body by default to get all on page
        else if (_is.undefined(container)) {
            container = document.body;
        }
Author	SHA1	Message	Date
Sam	15fd7041ab	Fixed AMD definition	2016-08-26 21:43:51 +10:00
Sam Potts	1ced6b4d67	Vimeo IE9/10 (Fixes #348 ), HTML5 ready event (Fixes #349 )	2016-08-26 18:15:24 +10:00
Sam	6694c1e6cf	Fix for Firefox full screen (fixes #343 )	2016-08-23 00:34:43 +10:00
Sam Potts	19ca906e50	Update changelog.md	2016-08-22 20:41:49 +10:00
Sam Potts	12e94775d6	Global keyboard shortcut changes	2016-08-22 14:44:18 +10:00