Skip to content

Commit

Permalink
Update videojs to 5.10.1
Browse files Browse the repository at this point in the history
Changelog is at

5.9.0
* https://github.com/videojs/video.js/releases/tag/v5.9.0

5.9.1
* https://github.com/videojs/video.js/releases/tag/v5.9.1

5.9.2
* https://github.com/videojs/video.js/releases/tag/v5.9.2

Microsoft Edge change
* updated IS_CHROME to not be true on MS Edge

5.10.1
*https://github.com/videojs/video.js/releases/tag/v5.10.1

Important: Changing resolution now works as of this change
videojs/video.js#3285

Which is in 5.10.1.

Ive tested and changing resolution now works.

Bug: T131544
Change-Id: I191d92f24609b22424c402d0ef7f4b44cf1e6b20
  • Loading branch information
paladox authored and hartman committed May 8, 2016
1 parent 501995e commit 2074f78
Show file tree
Hide file tree
Showing 12 changed files with 2,613 additions and 596 deletions.
2 changes: 2 additions & 0 deletions TimedMediaHandler.hooks.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public static function resourceLoaderRegisterModules( &$resourceLoader ) {
'cs' => 'resources/videojs/lang/cs.js',
'da' => 'resources/videojs/lang/da.js',
'de' => 'resources/videojs/lang/de.js',
'el' => 'resources/videojs/lang/el.js',
'en' => 'resources/videojs/lang/en.js',
'es' => 'resources/videojs/lang/es.js',
'fa' => 'resources/videojs/lang/fa.js',
Expand All @@ -114,6 +115,7 @@ public static function resourceLoaderRegisterModules( &$resourceLoader ) {
'nb' => 'resources/videojs/lang/nb.js',
'nl' => 'resources/videojs/lang/nl.js',
'nn' => 'resources/videojs/lang/nn.js',
'pl' => 'resources/videojs/lang/pl.js',
'pt-BR' => 'resources/videojs/lang/pt-BR.js',
'ru' => 'resources/videojs/lang/ru.js',
'sr' => 'resources/videojs/lang/sr.js',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"grunt-jsonlint": "1.0.7",
"grunt-patch": "^0.1.7",
"jscs-preset-wikimedia": "~1.0.0",
"video.js": "^5.8.8",
"video.js": "^5.10.1",
"videojs-ogvjs": "^1.1.0",
"videojs-resolution-switcher": "^0.4.2",
"videojs-responsive-layout": "^1.1.0"
Expand Down
19 changes: 11 additions & 8 deletions patches/videojs.defaults.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
diff --git a/resources/videojs/video.js b/resources/videojs/video.js
index 03daf68..473c1f9 100644
index c8882bf..cafa0e6 100644
--- a/resources/videojs/video.js
+++ b/resources/videojs/video.js
@@ -19811,15 +19811,6 @@ var videojs = function videojs(id, options, ready) {
@@ -21692,18 +21692,6 @@ var videojs = function videojs(id, options, ready) {
return tag['player'] || _player2['default'].players[tag.playerId] || new _player2['default'](tag, options, ready);
};

-// Add default styles
-var style = Dom.$('.vjs-styles-defaults');
-if (!style) {
- style = stylesheet.createStyleElement('vjs-styles-defaults');
- var head = Dom.$('head');
- head.insertBefore(style, head.firstChild);
- stylesheet.setTextContent(style, '\n .video-js {\n width: 300px;\n height: 150px;\n }\n\n .vjs-fluid {\n padding-top: 56.25%\n }\n ');
-if (_globalWindow2['default'].VIDEOJS_NO_DYNAMIC_STYLE !== true) {
- var style = Dom.$('.vjs-styles-defaults');
-
- if (!style) {
- style = stylesheet.createStyleElement('vjs-styles-defaults');
- var head = Dom.$('head');
- head.insertBefore(style, head.firstChild);
- stylesheet.setTextContent(style, '\n .video-js {\n width: 300px;\n height: 150px;\n }\n\n .vjs-fluid {\n padding-top: 56.25%\n }\n ');
- }
-}
-
// Run Auto-load players
Expand Down
Binary file modified resources/videojs/font/VideoJS.eot
Binary file not shown.
3 changes: 3 additions & 0 deletions resources/videojs/font/VideoJS.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 modified resources/videojs/font/VideoJS.ttf
Binary file not shown.
Binary file modified resources/videojs/font/VideoJS.woff
Binary file not shown.
34 changes: 34 additions & 0 deletions resources/videojs/lang/el.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
videojs.addLanguage("el",{
"Play": "Aναπαραγωγή",
"Pause": "Παύση",
"Current Time": "Τρέχων χρόνος",
"Duration Time": "Συνολικός χρόνος",
"Remaining Time": "Υπολοιπόμενος χρόνος",
"Stream Type": "Τύπος ροής",
"LIVE": "ΖΩΝΤΑΝΑ",
"Loaded": "Φόρτωση επιτυχής",
"Progress": "Πρόοδος",
"Fullscreen": "Πλήρης οθόνη",
"Non-Fullscreen": "Έξοδος από πλήρη οθόνη",
"Mute": "Σίγαση",
"Unmute": "Kατάργηση σίγασης",
"Playback Rate": "Ρυθμός αναπαραγωγής",
"Subtitles": "Υπότιτλοι",
"subtitles off": "απόκρυψη υπότιτλων",
"Captions": "Λεζάντες",
"captions off": "απόκρυψη λεζάντων",
"Chapters": "Κεφάλαια",
"You aborted the media playback": "Ακυρώσατε την αναπαραγωγή",
"A network error caused the media download to fail part-way.": "Ένα σφάλμα δικτύου προκάλεσε την αποτυχία μεταφόρτωσης του αρχείου προς αναπαραγωγή.",
"The media could not be loaded, either because the server or network failed or because the format is not supported.": "Το αρχείο προς αναπαραγωγή δεν ήταν δυνατό να φορτωθεί είτε γιατί υπήρξε σφάλμα στον διακομιστή ή το δίκτυο, είτε γιατί ο τύπος του αρχείου δεν υποστηρίζεται.",
"The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Η αναπαραγωγή ακυρώθηκε είτε λόγω κατεστραμμένου αρχείου, είτε γιατί το αρχείο απαιτεί λειτουργίες που δεν υποστηρίζονται από το πρόγραμμα περιήγησης που χρησιμοποιείτε.",
"No compatible source was found for this media.": "Δεν βρέθηκε συμβατή πηγή αναπαραγωγής για το συγκεκριμένο αρχείο.",
"Play video": "Αναπαραγωγή βίντεο",
"Close": "Κλείσιμο",
"Modal Window": "Aναδυόμενο παράθυρο",
"This is a modal window": "Το παρών είναι ένα αναδυόμενο παράθυρο",
"This modal can be closed by pressing the Escape key or activating the close button.": "Αυτό το παράθυρο μπορεί να εξαφανιστεί πατώντας το πλήκτρο Escape ή πατώντας το κουμπί κλεισίματος.",
", opens captions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις λεζάντες",
", opens subtitles settings dialog": ", εμφανίζει τις ρυθμίσεις για τους υπότιτλους",
", selected": ", επιλεγμένο"
});
3 changes: 3 additions & 0 deletions resources/videojs/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ videojs.addLanguage("en",{
"Captions": "Captions",
"captions off": "captions off",
"Chapters": "Chapters",
"Descriptions": "Descriptions",
"descriptions off": "descriptions off",
"You aborted the media playback": "You aborted the media playback",
"A network error caused the media download to fail part-way.": "A network error caused the media download to fail part-way.",
"The media could not be loaded, either because the server or network failed or because the format is not supported.": "The media could not be loaded, either because the server or network failed or because the format is not supported.",
Expand All @@ -30,5 +32,6 @@ videojs.addLanguage("en",{
"This modal can be closed by pressing the Escape key or activating the close button.": "This modal can be closed by pressing the Escape key or activating the close button.",
", opens captions settings dialog": ", opens captions settings dialog",
", opens subtitles settings dialog": ", opens subtitles settings dialog",
", opens descriptions settings dialog": ", opens descriptions settings dialog",
", selected": ", selected"
});
34 changes: 34 additions & 0 deletions resources/videojs/lang/pl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
videojs.addLanguage("pl",{
"Play": "Odtwarzaj",
"Pause": "Pauza",
"Current Time": "Aktualny czas",
"Duration Time": "Czas trwania",
"Remaining Time": "Pozostały czas",
"Stream Type": "Typ strumienia",
"LIVE": "NA ŻYWO",
"Loaded": "Załadowany",
"Progress": "Status",
"Fullscreen": "Pełny ekran",
"Non-Fullscreen": "Pełny ekran niedostępny",
"Mute": "Wyłącz dźwięk",
"Unmute": "Włącz dźwięk",
"Playback Rate": "Szybkość odtwarzania",
"Subtitles": "Napisy",
"subtitles off": "Napisy wyłączone",
"Captions": "Transkrypcja",
"captions off": "Transkrypcja wyłączona",
"Chapters": "Rozdziały",
"You aborted the media playback": "Odtwarzanie zostało przerwane",
"A network error caused the media download to fail part-way.": "Problemy z siecią spowodowały błąd przy pobieraniu materiału wideo.",
"The media could not be loaded, either because the server or network failed or because the format is not supported.": "Materiał wideo nie może być załadowany, ponieważ wystąpił problem z siecią lub format nie jest obsługiwany",
"The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Odtwarzanie materiału wideo zostało przerwane z powodu uszkodzonego pliku wideo lub z powodu błędu funkcji, które nie są wspierane przez przeglądarkę.",
"No compatible source was found for this media.": "Dla tego materiału wideo nie znaleziono kompatybilnego źródła.",
"Play video": "Odtwarzaj wideo",
"Close": "Zamknij",
"Modal Window": "Okno Modala",
"This is a modal window": "To jest okno modala",
"This modal can be closed by pressing the Escape key or activating the close button.": "Ten modal możesz zamknąć naciskając przycisk Escape albo wybierając przycisk Zamknij.",
", opens captions settings dialog": ", otwiera okno dialogowe ustawień transkrypcji",
", opens subtitles settings dialog": ", otwiera okno dialogowe napisów",
", selected": ", zaznaczone"
});
Loading

0 comments on commit 2074f78

Please sign in to comment.