diff options
| author | Sam <me@sampotts.me> | 2015-12-13 22:49:02 +1100 |
|---|---|---|
| committer | Sam <me@sampotts.me> | 2015-12-13 22:49:02 +1100 |
| commit | ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66 (patch) | |
| tree | 4feca9ae1fabe2d449184c44de109aa87876143b /docs/src/js | |
| parent | cd2532867c2976bcc61dc3fa2084a9e77bf59abf (diff) | |
| parent | 1371c1341fcc95d52394dc3f69900ae5041a5701 (diff) | |
| download | plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.tar.lz plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.tar.xz plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# docs/dist/docs.css
# docs/dist/docs.js
# docs/index.html
# docs/src/js/docs.js
# docs/src/less/components/icons.less
# docs/src/less/components/type.less
# docs/src/less/docs.less
# gulpfile.js
# package.json
# src/js/plyr.js
Diffstat (limited to 'docs/src/js')
| -rw-r--r-- | docs/src/js/docs.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/src/js/docs.js b/docs/src/js/docs.js index 4e2208ee..1e3c3206 100644 --- a/docs/src/js/docs.js +++ b/docs/src/js/docs.js @@ -2,7 +2,7 @@ // Docs example // ========================================================================== -/*global plyr, shr */ +/*global plyr, shr*/ // Setup the player plyr.setup({ @@ -25,7 +25,7 @@ shr.setup({ }); // General functions -(function() { +(function() { var buttons = document.querySelectorAll('[data-source]'); // Bind to each button @@ -103,7 +103,7 @@ shr.setup({ } })(); -// Google analytics +// Google analytics // For demo site (http://[www.]plyr.io) only if(document.domain.indexOf('plyr.io') > -1) { (function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){ @@ -112,4 +112,4 @@ if(document.domain.indexOf('plyr.io') > -1) { })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-40881672-11', 'auto'); ga('send', 'pageview'); -}
\ No newline at end of file +} |