diff options
| author | Sam Potts <me@sampotts.me> | 2015-06-07 23:00:26 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-06-07 23:00:26 +1000 |
| commit | 4c17f985208c147294cff0f05c39617d13e61efd (patch) | |
| tree | 9bf10b19ce13af98bac1fb725e798f7a3c0e30b9 /src | |
| parent | df84ce6e90b1e4bad78939cf4095493bd2e17b11 (diff) | |
| download | plyr-4c17f985208c147294cff0f05c39617d13e61efd.tar.lz plyr-4c17f985208c147294cff0f05c39617d13e61efd.tar.xz plyr-4c17f985208c147294cff0f05c39617d13e61efd.zip | |
TogglePlay API method (Fixes #86), Volume border (Fixes #87), Chrome Subs (Fixes #90)
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/plyr.js | 24 | ||||
| -rw-r--r-- | src/less/plyr.less | 3 | ||||
| -rw-r--r-- | src/sass/plyr.scss | 3 |
3 files changed, 25 insertions, 5 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index ba3d09b2..757bae40 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.1.10 +// plyr.js v1.1.11 // https://github.com/selz/plyr // License: The MIT License (MIT) // ========================================================================== @@ -901,13 +901,14 @@ // Enable UI _showCaptions(player); - // If IE 10/11 or Firefox 31+ or Safari 7+, don"t use native captioning (still doesn"t work although they claim it"s now supported) + // Disable unsupported browsers than report false positive if ((player.browser.name === "IE" && player.browser.version === 10) || (player.browser.name === "IE" && player.browser.version === 11) || (player.browser.name === "Firefox" && player.browser.version >= 31) || + (player.browser.name === "Chrome" && player.browser.version === 43) || (player.browser.name === "Safari" && player.browser.version >= 7)) { // Debugging - _log("Detected IE 10/11 or Firefox 31+ or Safari 7+."); + _log("Detected unsupported browser for HTML5 captions. Using fallback."); // Set to false so skips to "manual" captioning player.usingTextTracks = false; @@ -1027,6 +1028,22 @@ player.media.pause(); } + // Toggle playback + function _togglePlay(toggle) { + // Play + if(toggle === true) { + _play(); + } + // Pause + else if(toggle === false) { + _pause(); + } + // True toggle + else { + player.media[player.media.paused ? "play" : "pause"](); + } + } + // Rewind function _rewind(seekTime) { // Use default if needed @@ -1658,6 +1675,7 @@ source: _parseSource, poster: _updatePoster, setVolume: _setVolume, + togglePlay: _togglePlay, toggleMute: _toggleMute, toggleCaptions: _toggleCaptions, toggleFullscreen: _toggleFullscreen, diff --git a/src/less/plyr.less b/src/less/plyr.less index 4bd4c1ab..bd10d69f 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -463,7 +463,8 @@ margin: 0 @control-spacing 0 0; padding: 0; cursor: pointer; - background: none; + background: transparent; + border: none; // Webkit &::-webkit-slider-runnable-track { diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss index 69688d38..02d5e7ef 100644 --- a/src/sass/plyr.scss +++ b/src/sass/plyr.scss @@ -471,7 +471,8 @@ $bp-captions-large: 768px !default; // When captions jump to the larger fo margin: 0 $control-spacing 0 0; padding: 0; cursor: pointer; - background: none; + background: transparent; + border: none; // Webkit &::-webkit-slider-runnable-track { |