1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-25 02:42:10 +02:00

Merge branch 'master' of https://github.com/mbrubeck/video-js into mbrubeck-master

This commit is contained in:
Steve Heffernan 2011-03-24 17:48:07 -07:00
commit 6824c1f1d8

View File

@ -282,7 +282,7 @@ VideoJS.extend({
var match = navigator.userAgent.match(/OS (\d+)_/i);
if (match && match[1]) { return match[1]; }
},
isAndroid: function(){ return navigator.userAgent.match(/Android/i) !== null; },
isAndroid: function(){ return navigator.userAgent.match(/Android.*AppleWebKit/i) !== null; },
androidVersion: function() {
var match = navigator.userAgent.match(/Android (\d+)\./i);
if (match && match[1]) { return match[1]; }