diff options
| author | Sam Potts <me@sampotts.me> | 2017-04-15 23:22:35 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-04-15 23:22:35 +1000 |
| commit | 546cdaad92097b3bc6a85850ac16eb782d91193d (patch) | |
| tree | 261aa4dc5765ecaae407677e060f8d0ed666855d /src/js | |
| parent | 5d38497f0742626ad774b461be5ac164b34a6c16 (diff) | |
| parent | 808a3af3cf7df98d71ea79a960c09d06e0530805 (diff) | |
| download | plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.tar.lz plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.tar.xz plyr-546cdaad92097b3bc6a85850ac16eb782d91193d.zip | |
Merge branch 'develop' of https://github.com/Selz/plyr into develop
# Conflicts:
# dist/plyr.js
Diffstat (limited to 'src/js')
| -rw-r--r-- | src/js/plyr.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index a2e5989c..d7e6cec3 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -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; |