fix issue #15

hgoebl · Nov 12, 2014 · d37e670 · d37e670
1 parent 5bc9d89
commit d37e670
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+v0.4.3:
+  date: (snapshot)
+  changes:
+    - fix issue #15 (detect crazy Microsoft Mobile OS)
+
 v0.4.2:
   date: 2014-10-21
   changes:

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "mobile-detect",
-    "version": "0.4.2",
+    "version": "0.4.3-snapshot",
     "description": "Device detection (phone, tablet, desktop, mobile grade, os, versions)",
     "homepage": "http://hgoebl.github.io/mobile-detect.js/",
     "keywords": [

diff --git a/generate/mobile-detect.template.js b/generate/mobile-detect.template.js
@@ -46,6 +46,12 @@ define(function () {
         convertPropsToRegExp(mobileDetectRules.tablets);
         convertPropsToRegExp(mobileDetectRules.uas);
         convertPropsToRegExp(mobileDetectRules.utils);
+
+        // copy some patterns to oss0 which are tested first (see issue#15)
+        mobileDetectRules.oss0 = {
+            WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+            WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+        };
     }());
 
     function convertPropsToRegExp(object) {
@@ -438,7 +444,8 @@ define(function () {
          */
         os: function () {
             if (this._cache.os === undefined) {
-                this._cache.os = findMatch(mobileDetectRules.oss, this.ua);
+                this._cache.os = findMatch(mobileDetectRules.oss0, this.ua) ||
+                                 findMatch(mobileDetectRules.oss, this.ua);
             }
             return this._cache.os;
         },

diff --git a/mobile-detect.js b/mobile-detect.js
@@ -298,6 +298,12 @@ define(function () {
         convertPropsToRegExp(mobileDetectRules.tablets);
         convertPropsToRegExp(mobileDetectRules.uas);
         convertPropsToRegExp(mobileDetectRules.utils);
+
+        // copy some patterns to oss0 which are tested first (see issue#15)
+        mobileDetectRules.oss0 = {
+            WindowsPhoneOS: mobileDetectRules.oss.WindowsPhoneOS,
+            WindowsMobileOS: mobileDetectRules.oss.WindowsMobileOS
+        };
     }());
 
     function convertPropsToRegExp(object) {
@@ -714,7 +720,8 @@ define(function () {
          */
         os: function () {
             if (this._cache.os === undefined) {
-                this._cache.os = findMatch(mobileDetectRules.oss, this.ua);
+                this._cache.os = findMatch(mobileDetectRules.oss0, this.ua) ||
+                                 findMatch(mobileDetectRules.oss, this.ua);
             }
             return this._cache.os;
         },

diff --git a/mobile-detect.min.js b/mobile-detect.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mobile-detect",
-    "version": "0.4.2",
+    "version": "0.4.3-snapshot",
     "description": "Device detection (phone, tablet, desktop, mobile grade, os, versions)",
     "main": "mobile-detect.js",
     "scripts": {

diff --git a/tests/spec/MobileDetectSpec.js b/tests/spec/MobileDetectSpec.js
@@ -126,6 +126,10 @@ describe("Fixing issues", function () {
         expect(aut).toBeTablet(true);
         expect(aut).toBeMobile(true);
     });
+    it("should fix issue #15", function () {
+        var aut = new MobileDetect('Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; Virtual) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537', -1);
+        expect(aut.os()).toEqual('WindowsMobileOS');
+    });
 });
 
 describe("Feeding w/ ualist", function () {