Fixed bug with API use on basic supported browsers

Code cleanup
Merge pull request #111 from calvintam236/master
2015-08-21 21:36:15 +10:00 · 2015-08-13 21:34:17 +10:00 · 2015-08-13 21:32:10 +10:00 · 2015-08-13 01:39:13 -07:00 · 2015-08-13 01:36:20 -07:00 · 2015-08-13 01:15:57 -07:00
10 changed files with 511 additions and 492 deletions
--- a/changelog.md
+++ b/changelog.md
@ -1,5 +1,14 @@
 # Changelog

+# v1.3.5
+- Fixed bug with API use on basic supported browsers
+
+# v1.3.4
+- Code cleanup by @calvintam236
+
+# v1.3.3
+- Removed captions being read by screen readers
+
 # v1.3.2
 - Voiceover fix for captions

--- a/dist/plyr.js
+++ b/dist/plyr.js
--- a/dist/sprite.svg
+++ b/dist/sprite.svg
--- 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.3.2/docs.css">
+        <link rel="stylesheet" href="//cdn.plyr.io/1.3.5/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.3.2/plyr.css?3">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/plyr.css">

        <!-- Docs styles -->
-        <link rel="stylesheet" href="https://cdn.plyr.io/1.3.2/docs.css?1">
+        <link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/docs.css">
    </head>
    <body>
        <header>
@ -48,7 +48,7 @@
                            <source src="https://cdn.selz.com/plyr/1.0/movie.webm" type="video/webm">
                            
                            <!-- Text track file -->
-                            <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/en.vtt?2" default>
+                            <track kind="captions" label="English" srclang="en" src="https://cdn.selz.com/plyr/1.0/example_captions_en.vtt" default>
                            
                            <!-- Fallback for browsers that don't support the <video> element -->
                            <a href="https://cdn.selz.com/plyr/1.0/movie.mp4">Download</a>
@ -97,13 +97,13 @@
                    b.insertBefore(c, b.childNodes[0]);
                }
            }
-        })(document, "https://cdn.plyr.io/1.3.2/sprite.svg");
+        })(document, "https://cdn.plyr.io/1.3.5/sprite.svg");
        </script>

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

        <!-- Docs script -->
-        <script src="https://cdn.plyr.io/1.3.2/docs.js?1"></script>
+        <script src="https://cdn.plyr.io/1.3.5/docs.js"></script>
    </body>
 </html>
--- a/gulpfile.js
+++ b/gulpfile.js
@ -66,7 +66,12 @@ package = loadJSON(path.join(root, "package.json"));

 // Load json
 function loadJSON(path) {
-    return JSON.parse(fs.readFileSync(path));
+    try {
+        return JSON.parse(fs.readFileSync(path));
+    }
+    catch(err) {
+        return {};
+    }
 }

 var build = {
@ -215,8 +220,12 @@ options = {
        },
        gzippedOnly: true
    }
-},
-cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
+};
+
+// If aws is setup
+if("cdn" in aws) {
+    var cdnpath = new RegExp(aws.cdn.bucket + "\/(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)","gi");
+}

 // Publish version to CDN bucket
 gulp.task("cdn", function () {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "plyr",
-  "version": "1.3.2",
+  "version": "1.3.5",
  "description": "A simple HTML5 media player using custom controls",
  "homepage": "http://plyr.io",
  "main": "gulpfile.js",
--- a/readme.md
+++ b/readme.md
@ -40,7 +40,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.3.2/plyr.js` to `https://cdn.plyr.io/1.3.2/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.3.5/plyr.js` to `https://cdn.plyr.io/1.3.5/plyr.js`

 ### Bower
 If bower is your thang, you can grab Plyr using:
@ -60,11 +60,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.3.2/plyr.css">
-<script src="https://cdn.plyr.io/1.3.2/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/plyr.css">
+<script src="https://cdn.plyr.io/1.3.5/plyr.js"></script>
 ```

-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.2/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.5/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
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@ -19,9 +19,9 @@ $font-size-small:           14px !default;
 $font-size-base:            16px !default;

 // Captions
-$font-size-captions-base:   ceil(@font-size-base * 1.25) !default;
-$font-size-captions-medium: ceil(@font-size-base * 1.5) !default;
-$font-size-captions-large:  (@font-size-base * 2) !default;
+$font-size-captions-base:   ceil($font-size-base * 1.25) !default;
+$font-size-captions-medium: ceil($font-size-base * 1.5) !default;
+$font-size-captions-large:  ($font-size-base * 2) !default;

 // Controls
 $control-spacing:           10px !default;
@ -211,7 +211,7 @@ $bp-captions-large:         768px !default; // When captions jump to the larger
            display: none;
        }

-        @media (min-width: @bp-captions-large) {
+        @media (min-width: $bp-captions-large) {
            font-size: $font-size-captions-medium;
        }
    }
Author	SHA1	Message	Date
Sam Potts	6543fc1e5b	Fixed bug with API use on basic supported browsers	2015-08-21 21:36:15 +10:00
Sam Potts	9133247cdf	Code cleanup	2015-08-13 21:34:17 +10:00
Sam Potts	bf7f6f40bd	Merge pull request #111 from calvintam236/master Code cleanup	2015-08-13 21:32:10 +10:00
Calvin Tam	43a904917f	Fixed equal signs	2015-08-13 01:39:13 -07:00
Calvin Tam	9fe6e5ffcb	Converted double quote to single quote	2015-08-13 01:36:20 -07:00
Calvin Tam	a46e421bf6	Fixed syntax; Fixed some JSHint errors (Not escaped character, etc.)	2015-08-13 01:15:57 -07:00
Calvin Tam	20090aee03	Fixed missing semicolons mentioned by JSHint	2015-08-13 00:43:11 -07:00
Calvin Tam	c4ca7fe0d2	Updated tag closing	2015-08-13 00:38:30 -07:00
Calvin Tam	6b41752415	Use defined function instead of hard coding	2015-08-13 00:13:57 -07:00
Calvin Tam	2bc53d12ea	Use double quote for html strings	2015-08-12 23:38:39 -07:00
Calvin Tam	2f6dc5279b	Removed unnecessary "break"s	2015-08-12 23:13:58 -07:00
Calvin Tam	c8b2867b1f	Removed useless spaces	2015-08-12 23:13:13 -07:00
Calvin Tam	e56132ae3b	Standardized syntax	2015-08-12 22:58:33 -07:00
Sam Potts	45d4091c20	Merge branch 'master' of github.com:selz/plyr	2015-08-11 22:38:45 +10:00
Sam Potts	60c53a5894	Removed captions being read by screen readers	2015-08-11 22:38:06 +10:00
Sam Potts	032c823d3a	Merge pull request #108 from ChristianPV/patch-2 Update plyr.scss - Fix new scss!	2015-08-10 23:31:31 +10:00
khrizpv	66f724a3be	Update plyr.scss - Fix new scss! This is a fix the newly added scss.	2015-08-10 10:03:21 -03:00
Sam Potts	bf0c81b484	Docs	2015-08-09 09:29:33 +10:00
Sam Potts	aa72a17f44	Version bump	2015-08-08 21:02:55 +10:00