fix issue #5 (first check stronger tablet rules, then phone)

hgoebl · Jun 5, 2014 · 398ab6e · 398ab6e
1 parent cbf60cd
commit 398ab6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/generate/mobile-detect.template.js b/generate/mobile-detect.template.js
@@ -147,20 +147,21 @@
         }
         var phone, tablet, phoneSized;
 
-        phone = findMatch(mobileDetectRules.phones, userAgent);
-        if (phone) {
-            cache.mobile = cache.phone = phone;
-            cache.tablet = null;
-            return; // unambiguously identified as phone
-        }
-
+        // first check for stronger tablet rules, then phone (see issue#5)
         tablet = findMatch(mobileDetectRules.tablets, userAgent);
         if (tablet) {
             cache.mobile = cache.tablet = tablet;
             cache.phone = null;
             return; // unambiguously identified as tablet
         }
 
+        phone = findMatch(mobileDetectRules.phones, userAgent);
+        if (phone) {
+            cache.mobile = cache.phone = phone;
+            cache.tablet = null;
+            return; // unambiguously identified as phone
+        }
+
         // our rules haven't found a match -> try more general fallback rules
         if (isMobileFallback(userAgent)) {
             phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);

diff --git a/mobile-detect.js b/mobile-detect.js
@@ -371,20 +371,21 @@
         }
         var phone, tablet, phoneSized;
 
-        phone = findMatch(mobileDetectRules.phones, userAgent);
-        if (phone) {
-            cache.mobile = cache.phone = phone;
-            cache.tablet = null;
-            return; // unambiguously identified as phone
-        }
-
+        // first check for stronger tablet rules, then phone (see issue#5)
         tablet = findMatch(mobileDetectRules.tablets, userAgent);
         if (tablet) {
             cache.mobile = cache.tablet = tablet;
             cache.phone = null;
             return; // unambiguously identified as tablet
         }
 
+        phone = findMatch(mobileDetectRules.phones, userAgent);
+        if (phone) {
+            cache.mobile = cache.phone = phone;
+            cache.tablet = null;
+            return; // unambiguously identified as phone
+        }
+
         // our rules haven't found a match -> try more general fallback rules
         if (isMobileFallback(userAgent)) {
             phoneSized = MobileDetect.isPhoneSized(maxPhoneWidth);