Merge pull request #1354 from MediaBrowser/master

fix opera detection
2015-12-23 13:04:57 -05:00
parent aac4cbf8c6 c7796f7033
commit f7c68dca31
1 changed files with 6 additions and 1 deletions
@@ -2373,9 +2373,10 @@ var AppInfo = {};
            ua = ua.toLowerCase();

            var match = /(edge)[ \/]([\w.]+)/.exec(ua) ||
+                /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+                /(opr)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
                /(chrome)[ \/]([\w.]+)/.exec(ua) ||
                /(safari)[ \/]([\w.]+)/.exec(ua) ||
-                /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
                /(msie) ([\w.]+)/.exec(ua) ||
                ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
                [];
@@ -2396,6 +2397,10 @@ var AppInfo = {};
                browser = "msie";
            }

+            if (browser == 'opr') {
+                browser = 'opera';
+            }
+
            return {
                browser: browser,
                version: match[2] || "0",