jenkins-bot has submitted this change and it was merged.
Change subject: Update videojs-ogvjs to 1.2.0
......................................................................
Update videojs-ogvjs to 1.2.0
Change-Id: I4e6d5d2801c0a02b9014dc59ca9ea7c620d5f9b5
---
M package.json
M resources/videojs-ogvjs/videojs-ogvjs.js
2 files changed, 18 insertions(+), 7 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index eff4984..05eb6ef 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"grunt-patch": "^0.1.7",
"jscs-preset-wikimedia": "~1.0.0",
"video.js": "^5.10.1",
- "videojs-ogvjs": "^1.1.0",
+ "videojs-ogvjs": "^1.2.0",
"videojs-resolution-switcher": "^0.4.2",
"videojs-responsive-layout": "^1.1.0"
},
diff --git a/resources/videojs-ogvjs/videojs-ogvjs.js
b/resources/videojs-ogvjs/videojs-ogvjs.js
index 8ac48f8..8b7e3e6 100644
--- a/resources/videojs-ogvjs/videojs-ogvjs.js
+++ b/resources/videojs-ogvjs/videojs-ogvjs.js
@@ -1,6 +1,6 @@
/**
* videojs-ogvjs
- * @version 1.1.1
+ * @version 1.2.0
* @copyright 2016 Derk-Jan Hartman
* @license (MIT OR Apache-2.0)
*/
@@ -663,12 +663,23 @@
};
/*
- * Check if the tech can support the given source
- * @param {Object} srcObj The source object
- * @return {String} 'probably', 'maybe', or '' (empty string)
- */
+ * Determine if the specified media type can be played back
+ * by the Tech
+ *
+ * @param {String} type A media type description
+ * @return {String} 'probably', 'maybe', or '' (empty string)
+ */
+Ogvjs.canPlayType = function (type) {
+ return type.indexOf('/ogg') !== -1 ? 'maybe' : '';
+};
+
+/*
+ * Check if the tech can support the given source
+ * @param {Object} srcObj The source object
+ * @return {String} 'probably', 'maybe', or '' (empty string)
+ */
Ogvjs.canPlaySource = function (srcObj) {
- return srcObj.type.indexOf('/ogg') !== -1 ? 'maybe' : '';
+ return Ogvjs.canPlayType(srcObj.type);
};
/*
--
To view, visit https://gerrit.wikimedia.org/r/292111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e6d5d2801c0a02b9014dc59ca9ea7c620d5f9b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
