ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# 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
This commit is contained in:
Sam
2015-12-13 22:49:02 +11:00
parent cd2532867c 1371c1341f
commit ee2cdb2c9b
15 changed files with 223 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/src/js/docs.js
View File

@ -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');
}
}