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

Merge branch 'develop' of https://github.com/Selz/plyr into develop

Browse Source 
# Conflicts:
#	dist/plyr.js
This commit is contained in:
Sam Potts
2017-04-15 23:22:35 +10:00
parent 5d38497f07 808a3af3cf
commit 546cdaad92
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/js/plyr.js
View File

@ -1799,8 +1799,8 @@
}
// Get URL of caption file if exists
var captionSources = [],
captionSrc = '';
var captionSources = [];
var captionSrc = '';
player.elements.media.childNodes.forEach(function(child) {
if (child.nodeName.toLowerCase() === 'track') {
@ -3476,7 +3476,7 @@
mins = ('0' + mins).slice(-2);
// Generate display
var display = (displayHours ? hours + ':' : '') + mins + ':' + secs;
var label = (displayHours ? hours + ':' : '') + mins + ':' + secs;
// Render
element.textContent = display;