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

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	changelog.md
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	readme.md
#	yarn.lock
This commit is contained in:
Sam Potts
2019-01-26 16:50:37 +11:00
parent 464acd1a36 ad72ebd4bb
commit 44739a17d0
20 changed files with 128 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
demo/index.html
View File

@ -33,7 +33,11 @@
<meta name="twitter:card" content="summary_large_image" />
<!-- Docs styles -->
<<<<<<< HEAD
<link rel="stylesheet" href="dist/demo.css?v=2" />
=======
<link rel="stylesheet" href="dist/demo.css?2" />
>>>>>>> master
<!-- Preload -->
<link
@ -270,7 +274,11 @@
<!-- Polyfills -->
<script
<<<<<<< HEAD
src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL,Math.trunc"
=======
src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,Array.prototype.includes,CustomEvent,Object.entries,Object.values,URL"
>>>>>>> master
crossorigin="anonymous"
></script>
@ -284,6 +292,21 @@
<script src="https://cdn.rangetouch.com/1.0.1/rangetouch.js" async crossorigin="anonymous"></script>
<!-- Docs script -->
<<<<<<< HEAD
<script src="dist/demo.js" crossorigin="anonymous"></script>
=======
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-132699580-1"></script>
<script>
if (window.location.host === 'plyr.io') {
window.dataLayer = window.dataLayer || [];
function gtag() {
window.dataLayer.push(arguments);
}
gtag('js', new Date());
gtag('config', 'UA-132699580-1');
}
</script>
<script src="dist/demo.js?2" crossorigin="anonymous"></script>
>>>>>>> master
</body>
</html>