jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/375862 )
Change subject: Remove dead isAndroid2() code ...................................................................... Remove dead isAndroid2() code Android 2 is a Grade C browser which is no longer served any JavaScript code. As such, this method always returns false. Actual method to be removed in I15e97cdbbfcaa64a2. Change-Id: Ia56b52160608f9cbc9aef67bb89d7db04ddf14ad --- M MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js M MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js 2 files changed, 2 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js index 1e89ca0..14ba1cb 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedPlayer.js @@ -1698,8 +1698,7 @@ * cases where a native player is dipalyed such as iPhone. */ isPersistantPlayBtn: function(){ - return mw.isAndroid2() || - ( mw.isIphone() && mw.config.get( 'EmbedPlayer.iPhoneShowHTMLPlayScreen' ) ); + return ( mw.isIphone() && mw.config.get( 'EmbedPlayer.iPhoneShowHTMLPlayScreen' ) ); }, /** * Checks if native controls should be used @@ -1723,7 +1722,7 @@ // Do some device detection devices that don't support overlays // and go into full screen once play is clicked: - if( mw.isAndroid2() || mw.isIpod() || mw.isIphone() ){ + if( mw.isIpod() || mw.isIphone() ){ return true; } diff --git a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js index e22fc85..1c2cae5 100644 --- a/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js +++ b/MwEmbedModules/EmbedPlayer/resources/mw.EmbedTypes.js @@ -224,11 +224,6 @@ } } - // For now if Android assume we support h264Native (FIXME - // test on real devices ) - if ( mw.isAndroid2() ){ - this.mediaPlayers.addPlayer( h264NativePlayer ); - } // Test for ogg if ( dummyvid.canPlayType( 'video/ogg; codecs="theora, vorbis"' ) || -- To view, visit https://gerrit.wikimedia.org/r/375862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia56b52160608f9cbc9aef67bb89d7db04ddf14ad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@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