Compare commits

...

5 Commits

Author SHA1 Message Date
Sam Potts 26bd4d0833 Fix for fullscreen issues on Firefox
Fixes #38
2015-03-02 20:16:44 +11:00
Sam Potts b6d5ba43ec Merge branch 'master' of github.com:selz/plyr
Conflicts:
	.gitignore
2015-03-02 19:50:56 +11:00
Sam Potts 6cbcfd75d1 Ignore 2015-03-02 19:48:27 +11:00
Sam Potts ce39369d84 Fixed domain check 2015-03-02 01:32:30 +11:00
Sam Potts e73eb87c7e Fixed domain check 2015-03-02 01:31:31 +11:00
8 changed files with 15 additions and 11 deletions
+1
View File
@@ -3,3 +3,4 @@ node_modules
*.sublime-workspace *.sublime-workspace
.DS_Store .DS_Store
aws.json aws.json
docs/index.dev.html
+3
View File
@@ -1,5 +1,8 @@
# Changelog # Changelog
## v1.0.19
- Fixed firefox fullscreen issue (#38)
## v1.0.18 ## v1.0.18
- Added CDN references - Added CDN references
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -15,8 +15,8 @@ plyr.setup({
}); });
// Google analytics // Google analytics
// For demo site (http://plyr.io) only // For demo site (http://[www.]plyr.io) only
if(document.domain === "plyr.io") { if(document.domain.indexOf("plyr.io") > -1) {
(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "plyr", "name": "plyr",
"version": "1.0.18", "version": "1.0.19",
"description": "A simple HTML5 media player using custom controls", "description": "A simple HTML5 media player using custom controls",
"homepage": "http://plyr.io", "homepage": "http://plyr.io",
"main": "gulpfile.js", "main": "gulpfile.js",
+3 -3
View File
@@ -43,11 +43,11 @@ More info on setting up dependencies can be found in the [Bower Docs](http://bow
If you want to use our CDN, you can use the following. Currently it's HTTP only. If you want to use our CDN, you can use the following. Currently it's HTTP only.
```html ```html
<link rel="stylesheet" href="http://cdn.plyr.io/1.0.18/plyr.css"> <link rel="stylesheet" href="http://cdn.plyr.io/1.0.19/plyr.css">
<script src="http://cdn.plyr.io/1.0.18/plyr.js"></script> <script src="http://cdn.plyr.io/1.0.19/plyr.js"></script>
``` ```
You can also access the `sprite.svg` file at `http://cdn.plyr.io/1.0.18/sprite.svg`. You can also access the `sprite.svg` file at `http://cdn.plyr.io/1.0.19/sprite.svg`.
### CSS ### CSS
If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request.
+3 -3
View File
@@ -1,6 +1,6 @@
// ========================================================================== // ==========================================================================
// Plyr // Plyr
// plyr.js v1.0.17 // plyr.js v1.0.19
// https://github.com/sampotts/plyr // https://github.com/sampotts/plyr
// ========================================================================== // ==========================================================================
// Credits: http://paypal.github.io/accessible-html5-video-player/ // Credits: http://paypal.github.io/accessible-html5-video-player/
@@ -795,12 +795,12 @@
} }
// Toggle fullscreen // Toggle fullscreen
function _toggleFullscreen() { function _toggleFullscreen(event) {
// Check for native support // Check for native support
var nativeSupport = fullscreen.supportsFullScreen; var nativeSupport = fullscreen.supportsFullScreen;
// If it's a fullscreen change event, it's probably a native close // If it's a fullscreen change event, it's probably a native close
if(event.type === fullscreen.fullScreenEventName) { if(event && event.type === fullscreen.fullScreenEventName) {
config.fullscreen.active = fullscreen.isFullScreen(); config.fullscreen.active = fullscreen.isFullScreen();
} }
// If there's native support, use it // If there's native support, use it