Skip to content

Commit

Permalink
Release 4.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed Sep 3, 2014
1 parent 1c84f37 commit 88f59d7
Show file tree
Hide file tree
Showing 65 changed files with 10,735 additions and 138 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_

--------------------

## 4.8.0 (2014-09-03)
* @andekande added a German translation ([view](https://github.com/videojs/video.js/pull/1426))
* @mattosborn fixed a bug where getting the video element src would overwrite it ([view](https://github.com/videojs/video.js/pull/1430))
* @songpete fixed a bug where keyboard events were bubbling and causing additional actions ([view](https://github.com/videojs/video.js/pull/1455))
Expand All @@ -11,8 +16,6 @@ CHANGELOG
* @gkatsev fixed an issue where the controls would break if Flash was initialized too quickly ([view](https://github.com/videojs/video.js/pull/1470))
* @mmcc fixed an issue where if no playback tech was supported the error could not be caught ([view](https://github.com/videojs/video.js/pull/1473))

--------------------

## 4.7.3 (2014-08-20)
* Added function for adding new language translations, updated docs, and fixed the notSupportedMessage translation ([view](https://github.com/videojs/video.js/pull/1427))
* Exposed the player.selectSource method to allow overriding the source selection order ([view](https://github.com/videojs/video.js/pull/1424))
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.7.3",
"version": "4.8.0",
"main": [
"dist/video-js/video.js",
"dist/video-js/video-js.css"
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.7.3",
"version": "4.8.0",
"keywords": [
"videojs",
"html5",
Expand Down
41 changes: 41 additions & 0 deletions dist/video-js/demo.captions.vtt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
WEBVTT
00:00.700 --> 00:04.110
Captions describe all relevant audio for the hearing impaired.
[ Heroic music playing for a seagull ]

00:04.500 --> 00:05.000
[ Splash!!! ]

00:05.100 --> 00:06.000
[ Sploosh!!! ]

00:08.000 --> 00:09.225
[ Splash...splash...splash splash splash ]

00:10.525 --> 00:11.255
[ Splash, Sploosh again ]

00:13.500 --> 00:14.984
Dolphin: eeeEEEEEeeee!

00:14.984 --> 00:16.984
Dolphin: Squawk! eeeEEE?

00:25.000 --> 00:28.284
[ A whole ton of splashes ]

00:29.500 --> 00:31.000
Mine. Mine. Mine.

00:34.300 --> 00:36.000
Shark: Chomp

00:36.800 --> 00:37.900
Shark: CHOMP!!!

00:37.861 --> 00:41.193
EEEEEEOOOOOOOOOOWHALENOISE

00:42.593 --> 00:45.611
[ BIG SPLASH ]
32 changes: 32 additions & 0 deletions dist/video-js/demo.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<title>Video.js | HTML5 Video Player</title>

<!-- Chang URLs to wherever Video.js files will be hosted -->
<link href="video-js.css" rel="stylesheet" type="text/css">
<!-- video.js must be in the <head> for older IEs to work. -->
<script src="video.js"></script>

<!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
<script>
videojs.options.flash.swf = "video-js.swf";
</script>


</head>
<body>

<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
data-setup="{}">
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
<source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
<track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
<track kind="subtitles" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
<p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a></p>
</video>

</body>
</html>
Binary file added dist/video-js/font/vjs.eot
Binary file not shown.
28 changes: 28 additions & 0 deletions dist/video-js/font/vjs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added dist/video-js/font/vjs.ttf
Binary file not shown.
Binary file added dist/video-js/font/vjs.woff
Binary file not shown.
26 changes: 26 additions & 0 deletions dist/video-js/lang/de.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
videojs.addLanguage("de",{
"Play": "abspielen",
"Pause": "pausieren",
"Current Time": "aktueller Zeitpunkt",
"Duration Time": "gesamte Laufzeit",
"Remaining Time": "verbleibende Laufzeit",
"Stream Type": "Übertragungstyp",
"LIVE": "LIVE",
"Loaded": "geladen",
"Progress": "Fortschritt",
"Fullscreen": "Vollbildschirm AN",
"Non-Fullscreen": "Vollbildschirm AUS",
"Mute": "Ton AUS",
"Unmuted": "Ton AN",
"Playback Rate": "Wiedergabegeschwindigkeit",
"Subtitles": "Untertitel AN",
"subtitles off": "Untertitel AUS",
"Captions": "Titel AN",
"captions off": "Titel AUS",
"Chapters": "Kapitel",
"You aborted the video playback": "Sie haben die Video-Wiedergabe abgebrochen.",
"A network error caused the video download to fail part-way.": "Ein Fehler bei der Verbindung verursachte eine Unterbrechung mitten im Download.",
"The video could not be loaded, either because the server or network failed or because the format is not supported.": "Das Video konnte nicht geladen werden, entweder weil der Server bzw. die Verbindung gestört ist, oder weil das Format nicht kompatibel ist.",
"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Die Wiedergabe des Videos wurde unterbrochen. Entweder ist das Video beschädigt oder es benutzt ein Feature welches von diesem Browser nicht unterstützt wird.",
"No compatible source was found for this video.": "Für dieses Video wurde keine kompatible Quelle gefunden."
});
26 changes: 26 additions & 0 deletions dist/video-js/lang/es.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
videojs.addLanguage("es",{
"Play": "Juego",
"Pause": "Pausa",
"Current Time": "Tiempo Actual",
"Duration Time": "Tiempo de Duracion",
"Remaining Time": "Tiempo Restante",
"Stream Type": "Tipo de Transmision",
"LIVE": "En Vivo",
"Loaded": "Cargado",
"Progress": "Progreso",
"Fullscreen": "Pantalla Completa",
"Non-Fullscreen": "No Pantalla Completa",
"Mute": "Mudo",
"Unmuted": "Activar sonido",
"Playback Rate": "Reproduccion Cambio",
"Subtitles": "Subtitulos",
"subtitles off": "subtitulos fuera",
"Captions": "Subtitulos",
"captions off": "subtitulos fuera",
"Chapters": "Capitulos",
"You aborted the video playback": "Ha anulado la reproduccion de video",
"A network error caused the video download to fail part-way.": "Un error en la red hizo que la descarga de video falle parte del camino.",
"The video could not be loaded, either because the server or network failed or because the format is not supported.": "El video no se puede cargar, ya sea porque el servidor o la red fracasaron o porque el formato no es compatible.",
"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "La reproduccion de video se ha cancelado debido a un problema de corrupcion o porque el video utilizado cuenta con su navegador no soporta.",
"No compatible source was found for this video.": "Ninguna fuente compatible se encontro para este video."
});
Loading

0 comments on commit 88f59d7

Please sign in to comment.