Fix for omitted kind attribute on <track> (fixes #88 )

Docs
Minor tweaks
2015-07-25 20:45:11 +10:00 · 2015-07-25 20:29:54 +10:00 · 2015-07-25 20:29:19 +10:00
12 changed files with 28 additions and 22 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,8 @@
 # Changelog

+## v1.2.4
+- Fix for omitted kind attribute on <track> (fixes #88)
+
 ## v1.2.3
 - Fix for YouTube on iPhone or unsupported browsers (fallback to YouTube native)
 - Docs tidy up
--- a/dist/plyr.js
+++ b/dist/plyr.js
--- a/docs/dist/docs.css
+++ b/docs/dist/docs.css
--- a/docs/error.html
+++ b/docs/error.html
@ -6,7 +6,7 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <!-- Docs styles -->
-        <link rel="stylesheet" href="//cdn.plyr.io/1.2.3/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.2.4/docs.css">
    </head>
    <body>
        <main>
--- a/docs/index.html
+++ b/docs/index.html
@ -8,10 +8,10 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <!-- Styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css?1">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css?1">

        <!-- Docs styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/docs.css?4">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/docs.css?1">
    </head>
    <body>
        <header>
@ -97,13 +97,13 @@
                    b.insertBefore(c, b.childNodes[0]);
                }
            }
-        })(document, "https://cdn.plyr.io/1.2.3/sprite.svg");
+        })(document, "https://cdn.plyr.io/1.2.4/sprite.svg");
        </script>

        <!-- Plyr core script -->
-        <script src="https://cdn.plyr.io/1.2.3/plyr.js?1"></script>
+        <script src="https://cdn.plyr.io/1.2.4/plyr.js?1"></script>

        <!-- Docs script -->
-        <script src="https://cdn.plyr.io/1.2.3/docs.js?1"></script>
+        <script src="https://cdn.plyr.io/1.2.4/docs.js?1"></script>
    </body>
 </html>
--- a/docs/src/less/components/buttons.less
+++ b/docs/src/less/components/buttons.less
@ -25,6 +25,7 @@ nav {
 	position: relative;
 	margin: 0 auto @padding-base;
 	max-width: @example-width-video;
+	white-space: nowrap;

 	&::before {
 		content: "";
--- a/gulpfile.js
+++ b/gulpfile.js
@ -167,7 +167,7 @@ build.js(bundles.docs.js, "docs");

 // Default gulp task
 gulp.task("default", function(){
-    run("templates", tasks.js, tasks.less, "sprite");
+    run("templates", tasks.js, tasks.less, "sprite", "watch");
 });

 // Build all JS (inc. templates)
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "1.2.3",
+  "version": "1.2.4",
  "description": "A simple HTML5 media player using custom controls",
  "homepage": "http://plyr.io",
  "main": "gulpfile.js",
--- a/readme.md
+++ b/readme.md
@ -39,7 +39,7 @@ If you have any cool ideas or features, please let me know by [creating an issue

 Check `docs/index.html` and `docs/dist/docs.js` for an example setup. 

-**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.2.3/plyr.js` to `https://cdn.plyr.io/1.2.3/plyr.js`
+**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.2.4/plyr.js` to `https://cdn.plyr.io/1.2.4/plyr.js`

 ### Bower
 If bower is your thang, you can grab Plyr using:
@ -59,11 +59,11 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub]
 If you want to use our CDN, you can use the following:

 ```html
-<link rel="stylesheet" href="https://cdn.plyr.io/1.2.3/plyr.css">
-<script src="https://cdn.plyr.io/1.2.3/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.2.4/plyr.css">
+<script src="https://cdn.plyr.io/1.2.4/plyr.js"></script>
 ```

-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.3/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.4/sprite.svg`.

 ### 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. 
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -1,6 +1,6 @@
 // ==========================================================================
 // Plyr
-// plyr.js v1.2.3
+// plyr.js v1.2.4
 // https://github.com/selz/plyr
 // License: The MIT License (MIT)
 // ==========================================================================
@ -559,9 +559,8 @@

            fullscreen.isFullScreen = function(element) {
                if(typeof element == "undefined") {
-                    element = document;
+                    element = document.body;
                }
-
                switch (this.prefix) {
                    case "":
                        return document.fullscreenElement == element;
@ -572,6 +571,9 @@
                }
            };
            fullscreen.requestFullScreen = function(element) {
+                if(typeof element == "undefined") {
+                    element = document.body;
+                }
                return (this.prefix === "") ? element.requestFullScreen() : element[this.prefix + (this.prefix == "ms" ? "RequestFullscreen" : "RequestFullScreen")]();
            };
            fullscreen.cancelFullScreen = function() {
@ -1026,8 +1028,8 @@

                for (var i = 0; i < children.length; i++) {
                    if (children[i].nodeName.toLowerCase() === "track") {
-                        kind = children[i].getAttribute("kind");
-                        if (kind === "captions") {
+                        kind = children[i].kind;
+                        if (kind === "captions" || kind === "subtitles") {
                            captionSrc = children[i].getAttribute("src");
                        }
                    }
@ -1079,7 +1081,7 @@
                        for (var y=0; y < tracks.length; y++) {
                            var track = tracks[y];

-                            if (track.kind === "captions") {
+                            if (track.kind === "captions" || track.kind === "subtitles") {
                                _on(track, "cuechange", function() {
                                    // Clear container
                                    player.captionsContainer.innerHTML = "";
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@ -497,7 +497,7 @@
    // Volume control
    // <input[type='range']> element
    // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &-volume[type="range"] {
        display: inline-block;
        vertical-align: middle;
        -webkit-appearance: none;
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@ -495,7 +495,7 @@ $bp-captions-large:       768px !default; // When captions jump to the larger fo
    // Volume control
    // <input[type='range']> element
    // Specificity is for bootstrap compatibility
-    &-volume[type=range] {
+    &-volume[type="range"] {
        display: inline-block;
        vertical-align: middle;
        -webkit-appearance: none;
Author	SHA1	Message	Date
Sam Potts	e0cd34c996	Fix for omitted kind attribute on <track> (fixes #88 )	2015-07-25 20:45:11 +10:00
Sam Potts	06641d5709	Docs	2015-07-25 20:29:54 +10:00
Sam Potts	a0d2d5cd24	Minor tweaks	2015-07-25 20:29:19 +10:00