Skip to content

Commit dd24d17

Browse files
heffheff
committed
Release 4.12.0
1 parent 5bae2d8 commit dd24d17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+25157
-7582
lines changed

‎CHANGELOG.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ CHANGELOG
22
=========
33

44
## HEAD (Unreleased)
5+
_(none)_
6+
7+
--------------------
8+
9+
## 4.12.0 (2015-02-17)
510
* @PeterDaveHello added a Traditional Chinese translation ([view](https://github.com/videojs/video.js/pull/1729))
611
* @mmcc updated the hide/show functions to use a class instead of inline styles ([view](https://github.com/videojs/video.js/pull/1681))
712
* @mister-ben added better handling of the additional videojs() arguments when the player is already initialized ([view](https://github.com/videojs/video.js/pull/1730))
@@ -30,8 +35,6 @@ CHANGELOG
3035
* @gkatsev fixed captions showing by default in Chrome and Safari ([view](https://github.com/videojs/video.js/pull/1865))
3136
* @mister-ben fixed a woff warning in Firefox ([view](https://github.com/videojs/video.js/pull/1870))
3237

33-
--------------------
34-
3538
## 4.11.4 (2015-01-23)
3639
* @heff exported missing source handler functions ([view](https://github.com/videojs/video.js/pull/1787))
3740
* @heff fixed type support checking for an empty src string ([view](https://github.com/videojs/video.js/pull/1797))

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "video.js",
33
"description": "An HTML5 and Flash video player with a common API and skin for both.",
4-
"version": "4.11.4",
4+
"version": "4.12.0",
55
"main": [
66
"dist/video-js/video.js",
77
"dist/video-js/video-js.css",

‎component.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "video.js",
33
"description": "An HTML5 and Flash video player with a common API and skin for both.",
4-
"version": "4.11.4",
4+
"version": "4.12.0",
55
"keywords": [
66
"videojs",
77
"html5",

‎dist/video-js/demo.captions.vtt

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
WEBVTT
2+
3+
00:00.700 --> 00:04.110
4+
Captions describe all relevant audio for the hearing impaired.
5+
[ Heroic music playing for a seagull ]
6+
7+
00:04.500 --> 00:05.000
8+
[ Splash!!! ]
9+
10+
00:05.100 --> 00:06.000
11+
[ Sploosh!!! ]
12+
13+
00:08.000 --> 00:09.225
14+
[ Splash...splash...splash splash splash ]
15+
16+
00:10.525 --> 00:11.255
17+
[ Splash, Sploosh again ]
18+
19+
00:13.500 --> 00:14.984
20+
Dolphin: eeeEEEEEeeee!
21+
22+
00:14.984 --> 00:16.984
23+
Dolphin: Squawk! eeeEEE?
24+
25+
00:25.000 --> 00:28.284
26+
[ A whole ton of splashes ]
27+
28+
00:29.500 --> 00:31.000
29+
Mine. Mine. Mine.
30+
31+
00:34.300 --> 00:36.000
32+
Shark: Chomp
33+
34+
00:36.800 --> 00:37.900
35+
Shark: CHOMP!!!
36+
37+
00:37.861 --> 00:41.193
38+
EEEEEEOOOOOOOOOOWHALENOISE
39+
40+
00:42.593 --> 00:45.611
41+
[ BIG SPLASH ]

‎dist/video-js/demo.html

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Video.js | HTML5 Video Player</title>
5+
6+
<!-- Chang URLs to wherever Video.js files will be hosted -->
7+
<link href="video-js.css" rel="stylesheet" type="text/css">
8+
<!-- video.js must be in the <head> for older IEs to work. -->
9+
<script src="video.js"></script>
10+
11+
<!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
12+
<script>
13+
videojs.options.flash.swf = "video-js.swf";
14+
</script>
15+
16+
17+
</head>
18+
<body>
19+
20+
<video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
21+
poster="http://video-js.zencoder.com/oceans-clip.png"
22+
data-setup="{}">
23+
<source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
24+
<source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
25+
<source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
26+
<track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
27+
<track kind="subtitles" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
28+
<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>
29+
</video>
30+
31+
</body>
32+
</html>

‎dist/video-js/font/vjs.eot

4.69 KB
Binary file not shown.

‎dist/video-js/font/vjs.svg

+28
Loading

‎dist/video-js/font/vjs.ttf

4.53 KB
Binary file not shown.

‎dist/video-js/font/vjs.woff

2.45 KB
Binary file not shown.

‎dist/video-js/lang/ar.js

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
videojs.addLanguage("ar",{
2+
"Play": "تشغيل",
3+
"Pause": "ايقاف",
4+
"Current Time": "الوقت الحالي",
5+
"Duration Time": "Dauer",
6+
"Remaining Time": "الوقت المتبقي",
7+
"Stream Type": "نوع التيار",
8+
"LIVE": "مباشر",
9+
"Loaded": "تم التحميل",
10+
"Progress": "التقدم",
11+
"Fullscreen": "ملء الشاشة",
12+
"Non-Fullscreen": "غير ملء الشاشة",
13+
"Mute": "صامت",
14+
"Unmuted": "غير الصامت",
15+
"Playback Rate": "معدل التشغيل",
16+
"Subtitles": "الترجمة",
17+
"subtitles off": "ايقاف الترجمة",
18+
"Captions": "التعليقات",
19+
"captions off": "ايقاف التعليقات",
20+
"Chapters": "فصول",
21+
"You aborted the video playback": "لقد ألغيت تشغيل الفيديو",
22+
"A network error caused the video download to fail part-way.": "تسبب خطأ في الشبكة بفشل تحميل الفيديو بالكامل.",
23+
"The video could not be loaded, either because the server or network failed or because the format is not supported.": "لا يمكن تحميل الفيديو بسبب فشل في الخادم أو الشبكة ، أو فشل بسبب عدم امكانية قراءة تنسيق الفيديو.",
24+
"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "تم ايقاف تشغيل الفيديو بسبب مشكلة فساد أو لأن الفيديو المستخدم يستخدم ميزات غير مدعومة من متصفحك.",
25+
"No compatible source was found for this video.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو."
26+
});

‎dist/video-js/lang/bg.js

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
videojs.addLanguage("bg",{
2+
"Play": "Възпроизвеждане",
3+
"Pause": "Пауза",
4+
"Current Time": "Текущо време",
5+
"Duration Time": "Продължителност",
6+
"Remaining Time": "Оставащо време",
7+
"Stream Type": "Тип на потока",
8+
"LIVE": "НА ЖИВО",
9+
"Loaded": "Заредено",
10+
"Progress": "Прогрес",
11+
"Fullscreen": "Цял екран",
12+
"Non-Fullscreen": "Спиране на цял екран",
13+
"Mute": "Без звук",
14+
"Unmuted": "Със звук",
15+
"Playback Rate": "Скорост на възпроизвеждане",
16+
"Subtitles": "Субтитри",
17+
"subtitles off": "Спряни субтитри",
18+
"Captions": "Аудио надписи",
19+
"captions off": "Спряни аудио надписи",
20+
"Chapters": "Глави",
21+
"You aborted the video playback": "Спряхте възпроизвеждането на видеото",
22+
"A network error caused the video download to fail part-way.": "Грешка в мрежата провали изтеглянето на видеото.",
23+
"The video could not be loaded, either because the server or network failed or because the format is not supported.": "Видеото не може да бъде заредено заради проблем със сървъра или мрежата или защото този формат не е поддържан.",
24+
"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Възпроизвеждането на видеото беше прекъснато заради проблем с файла или защото видеото използва опции които браузърът Ви не поддържа.",
25+
"No compatible source was found for this video.": "Не беше намерен съвместим източник за това видео."
26+
});

‎dist/video-js/lang/de.js

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
videojs.addLanguage("de",{
2+
"Play": "Wiedergabe",
3+
"Pause": "Pause",
4+
"Current Time": "Aktueller Zeitpunkt",
5+
"Duration Time": "Dauer",
6+
"Remaining Time": "Verbleibende Zeit",
7+
"Stream Type": "Streamtyp",
8+
"LIVE": "LIVE",
9+
"Loaded": "Geladen",
10+
"Progress": "Status",
11+
"Fullscreen": "Vollbild",
12+
"Non-Fullscreen": "Kein Vollbild",
13+
"Mute": "Ton aus",
14+
"Unmuted": "Ton ein",
15+
"Playback Rate": "Wiedergabegeschwindigkeit",
16+
"Subtitles": "Untertitel",
17+
"subtitles off": "Untertitel aus",
18+
"Captions": "Untertitel",
19+
"captions off": "Untertitel aus",
20+
"Chapters": "Kapitel",
21+
"You aborted the video playback": "Sie haben die Videowiedergabe abgebrochen.",
22+
"A network error caused the video download to fail part-way.": "Der Videodownload ist aufgrund eines Netzwerkfehlers fehlgeschlagen.",
23+
"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, da entweder ein Server- oder Netzwerkfehler auftrat oder das Format nicht unterstützt wird.",
24+
"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Die Videowiedergabe wurde entweder wegen eines Problems mit einem beschädigten Video oder wegen verwendeten Funktionen, die vom Browser nicht unterstützt werden, abgebrochen.",
25+
"No compatible source was found for this video.": "Für dieses Video wurde keine kompatible Quelle gefunden."
26+
});

0 commit comments

Comments
 (0)