Skip to content

Commit 01adb2d

Browse files
committed
change way browser and version found
1 parent 8a791a3 commit 01adb2d

File tree

1 file changed

+14
-31
lines changed

1 file changed

+14
-31
lines changed

qiita_pet/templates/sitebase.html

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,20 @@
3434
jumbotron.style.visibility = "hidden";
3535
}
3636

37-
// from http://mrbool.com/how-to-detect-different-browsers-and-their-versions-using-javascript/25424
38-
var objappVersion = navigator.appVersion;
39-
var objAgent = navigator.userAgent;
40-
var objbrowserName = navigator.appName;
41-
var objfullVersion = ''+parseFloat(navigator.appVersion);
42-
var objBrMajorVersion = parseInt(navigator.appVersion,10);
43-
var objOffsetName,objOffsetVersion,ix;
44-
// In Chrome
45-
if ((objOffsetVersion=objAgent.indexOf("Chrome"))!=-1) {
46-
objbrowserName = "Chrome";
47-
objfullVersion = objAgent.substring(objOffsetVersion+7);
48-
} // In Firefox
49-
else if ((objOffsetVersion=objAgent.indexOf("Firefox"))!=-1) {
50-
objbrowserName = "Firefox";
51-
} // In Safari
52-
else if ((objOffsetVersion=objAgent.indexOf("Safari"))!=-1) {
53-
objbrowserName = "Safari";
54-
objfullVersion = objAgent.substring(objOffsetVersion+7);
55-
if ((objOffsetVersion=objAgent.indexOf("Version"))!=-1)
56-
objfullVersion = objAgent.substring(objOffsetVersion+8);
57-
}
58-
// trimming the fullVersion string at semicolon/space if present
59-
if ((ix=objfullVersion.indexOf(";"))!=-1)
60-
objfullVersion=objfullVersion.substring(0,ix);
61-
if ((ix=objfullVersion.indexOf(" "))!=-1)
62-
objfullVersion=objfullVersion.substring(0,ix);
63-
objBrMajorVersion = parseInt(''+objfullVersion,10);
64-
if (isNaN(objBrMajorVersion)) {
65-
objfullVersion = ''+parseFloat(navigator.appVersion);
66-
objBrMajorVersion = parseInt(navigator.appVersion,10);
67-
}
37+
// from http://stackoverflow.com/questions/5916900/how-can-you-detect-the-version-of-a-browser
38+
var ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
39+
if(/trident/i.test(M[1])){
40+
tem=/\brv[ :]+(\d+)/g.exec(ua) || [];
41+
return 'IE '+(tem[1]||'');
42+
}
43+
if(M[1]==='Chrome'){
44+
tem=ua.match(/\bOPR\/(\d+)/)
45+
if(tem!=null) {return 'Opera '+tem[1];}
46+
}
47+
M=M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
48+
if((tem=ua.match(/version\/(\d+)/i))!=null) {M.splice(1,1,tem[1]);}
49+
objbrowserName = M[0];
50+
objBrMajorVersion = M[1];
6851

6952
if ((objbrowserName == "Chrome" && objBrMajorVersion < {{allowed_min_browser_versions['chrome']}}) ||
7053
(objbrowserName == "Firefox" && objBrMajorVersion < {{allowed_min_browser_versions['firefox']}}) ||

0 commit comments

Comments
 (0)