Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/280499
Change subject: Update videojs to 5.8.7 ...................................................................... Update videojs to 5.8.7 Changelog at https://github.com/videojs/video.js/releases/tag/v5.8.7 Change-Id: I8b701ab91ffa7977b8bb1d14a30d8a93d44eadd6 --- M package.json M resources/videojs/lang/ar.js M resources/videojs/video.js 3 files changed, 47 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler refs/changes/99/280499/1 diff --git a/package.json b/package.json index ae22d2b..1ec822f 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "grunt-jsonlint": "1.0.7", "grunt-patch": "^0.1.7", "jscs-preset-wikimedia": "~1.0.0", - "video.js": "^5.8.6", + "video.js": "^5.8.7", "videojs-resolution-switcher": "^0.4.1" } } diff --git a/resources/videojs/lang/ar.js b/resources/videojs/lang/ar.js index ddd9428..4c49d62 100644 --- a/resources/videojs/lang/ar.js +++ b/resources/videojs/lang/ar.js @@ -22,5 +22,13 @@ "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.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو." + "No compatible source was found for this media.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو.", + "Play Video": "تشغيل الفيديو", + "Close": "أغلق", + "Modal Window": "نافذة مشروطة", + "This is a modal window": "هذه نافذة مشروطة", + "This modal can be closed by pressing the Escape key or activating the close button.": "يمكن غلق هذه النافذة المشروطة عن طريق الضغط على زر الخروج أو تفعيل زر الإغلاق", + ", opens captions settings dialog": ", تفتح نافذة خيارات التعليقات", + ", opens subtitles settings dialog": ", تفتح نافذة خيارات الترجمة", + ", selected": ", مختار" }); \ No newline at end of file diff --git a/resources/videojs/video.js b/resources/videojs/video.js index b4261e0..54357d1 100644 --- a/resources/videojs/video.js +++ b/resources/videojs/video.js @@ -1,6 +1,6 @@ /** * @license - * Video.js 5.8.6 <http://videojs.com/> + * Video.js 5.8.7 <http://videojs.com/> * Copyright Brightcove, Inc. <https://www.brightcove.com/> * Available under Apache License Version 2.0 * <https://github.com/videojs/video.js/blob/master/LICENSE> @@ -4740,7 +4740,8 @@ ControlBar.prototype.createEl = function createEl() { return _Component.prototype.createEl.call(this, 'div', { - className: 'vjs-control-bar' + className: 'vjs-control-bar', + dir: 'ltr' }, { 'role': 'group' // The control bar is a group, so it can contain menuitems }); @@ -8154,7 +8155,8 @@ LoadingSpinner.prototype.createEl = function createEl() { return _Component.prototype.createEl.call(this, 'div', { - className: 'vjs-loading-spinner' + className: 'vjs-loading-spinner', + dir: 'ltr' }); }; @@ -8806,7 +8808,7 @@ var item = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0]; var children = this.children().slice(); - var haveTitle = children[0].className && /vjs-menu-title/.test(children[0].className); + var haveTitle = children.length && children[0].className && /vjs-menu-title/.test(children[0].className); if (haveTitle) { children.shift(); @@ -12243,7 +12245,7 @@ languages: {}, // Default message to show when a video cannot be played. - notSupportedMessage: 'No compatible source was found for this video.' + notSupportedMessage: 'No compatible source was found for this media.' }; /** @@ -14183,10 +14185,18 @@ Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() { var tt = this.el().textTracks; - if (tt && tt.addEventListener) { - tt.addEventListener('change', this.handleTextTrackChange_); - tt.addEventListener('addtrack', this.handleTextTrackAdd_); - tt.addEventListener('removetrack', this.handleTextTrackRemove_); + if (tt) { + // Add tracks - if player is initialised after DOM loaded, textTracks + // will not trigger addtrack + for (var i = 0; i < tt.length; i++) { + this.textTracks().addTrack_(tt[i]); + } + + if (tt.addEventListener) { + tt.addEventListener('change', this.handleTextTrackChange_); + tt.addEventListener('addtrack', this.handleTextTrackAdd_); + tt.addEventListener('removetrack', this.handleTextTrackRemove_); + } } }; @@ -16960,12 +16970,15 @@ track.addEventListener('modechange', Fn.bind(this, function () { this.trigger('change'); })); - this.tracks_.push(track); - this.trigger({ - track: track, - type: 'addtrack' - }); + // Do not add duplicate tracks + if (this.tracks_.indexOf(track) === -1) { + this.tracks_.push(track); + this.trigger({ + track: track, + type: 'addtrack' + }); + } }; /** @@ -19794,6 +19807,15 @@ 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 '); +} + // Run Auto-load players // You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) setup.autoSetupTimeout(1, videojs); @@ -19803,7 +19825,7 @@ * * @type {String} */ -videojs.VERSION = '5.8.6'; +videojs.VERSION = '5.8.7'; /** * The global options object. These are the settings that take effect -- To view, visit https://gerrit.wikimedia.org/r/280499 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b701ab91ffa7977b8bb1d14a30d8a93d44eadd6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Paladox <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
