jenkins-bot has submitted this change and it was merged. Change subject: Feature detect OOJS compatibility ......................................................................
Feature detect OOJS compatibility OOJS uses es5-shim but does not use es5-sham so the following ES5 functions are not polyfilled: Object.getPrototypeOf Object.defineProperty Object.getOwnPropertyDescriptor Object.getOwnPropertyNames Object.create Object.defineProperties Object.seal Object.freeze Object.preventExtensions Object.isSealed Object.isFrozen Object.isExtensible Grepping on them shows that Object.create is the only one in use in OOJS, so checking for its existence should be enough to ensure that OOJS works in the given browser. Change-Id: Icf54a9c35b3599dd1831c10ffcd9f15573dc8b00 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/813 --- M MultimediaViewer.php M resources/mmv/mmv.base.js 2 files changed, 9 insertions(+), 10 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 98c6cc5..7d23bea 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -310,10 +310,6 @@ 'scripts' => array( 'mmv/mmv.base.js', ), - - 'dependencies' => array( - 'jquery.client', - ), ), 'mmv.ui' => $wgMediaViewerResourceTemplate + array( diff --git a/resources/mmv/mmv.base.js b/resources/mmv/mmv.base.js index f9154d8..97ee0ea 100644 --- a/resources/mmv/mmv.base.js +++ b/resources/mmv/mmv.base.js @@ -16,13 +16,16 @@ */ // Included on every page which has images so keep it lightweight. -( function ( mw, $ ) { +( function ( mw ) { mw.mmv = { - // We have to disable support for IE < 9 until this is fixed: https://bugzilla.wikimedia.org/show_bug.cgi?id=63303 - // This can't be done with feature detection, as the error IE triggers in that situation can't be caught + /** + * Feature-detects OOJS support. OOJS uses es5-shim, and from the remaining ES5 additions + * (the ones provided by es5-sham) the only one it uses is Object.create. + * @member mw.mmv.MultimediaViewer + * @return {boolean} + */ isBrowserSupported : function () { - var profile = $.client.profile(); - return ! ( profile.name === 'msie' && profile.versionNumber < 9 ); + return !!Object.create; } }; -}( mediaWiki, jQuery ) ); +}( mediaWiki ) ); -- To view, visit https://gerrit.wikimedia.org/r/150086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf54a9c35b3599dd1831c10ffcd9f15573dc8b00 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
