Merge pull request #830 from miketaylr/no-android-version

Fixes #647: Update android regex to match Firefox for Android.

Author: madrobby

src/detect.js

@@ -6,7 +6,7 @@
   function detect(ua){
     var os = this.os = {}, browser = this.browser = {},
       webkit = ua.match(/WebKit\/([\d.]+)/),
-      android = ua.match(/(Android)\s+([\d.]+)/),
+      android = ua.match(/(Android);?\s+([\d.]+)?/),
       ipad = ua.match(/(iPad).*OS\s([\d_]+)/),
       ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/),
       iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),

test/detect.html

@@ -337,13 +337,15 @@ <h1>Browser detection</h1>
         detect(UA.Firefox_13_Tablet, function(os, browser){
           t.assertTrue(browser.firefox)
           t.assertFalse(browser.webkit)
+          t.assertTrue(os.android)
           t.assertFalse(os.phone)
           t.assertTrue(os.tablet)
         })
 
         detect(UA.Firefox_13_Phone, function(os, browser){
           t.assertTrue(browser.firefox)
           t.assertFalse(browser.webkit)
+          t.assertTrue(os.android)
           t.assertTrue(os.phone)
           t.assertFalse(os.tablet)
         })