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
This commit is contained in:
@ -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');
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user