[fusion-commits] r2917 - in branches/fusion-mg30: . common

[svn_fusion at osgeo.org]

Author: jng
Date: 2015-06-14 07:08:48 -0700 (Sun, 14 Jun 2015)
New Revision: 2917

Modified:
   branches/fusion-mg30/
   branches/fusion-mg30/common/browserdetect.js
Log:
Merged revision(s) 2915 from trunk:
#633: Update browserdetect.js
........



Property changes on: branches/fusion-mg30
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908
   + /branches/fusion-mg24:2560
/branches/fusion-mg26:2855,2869
/sandbox/adsk/2.6l:2911
/sandbox/createruntimemap:2699-2708
/sandbox/jxlib-3.0:1957-2248
/sandbox/ol213:2801-2803
/sandbox/robust_error_handling:2818-2825
/sandbox/stamen:2873-2875
/sandbox/tiling:2845-2846
/trunk:2896-2899,2905-2908,2915

Modified: branches/fusion-mg30/common/browserdetect.js
===================================================================
--- branches/fusion-mg30/common/browserdetect.js	2015-06-14 14:07:32 UTC (rev 2916)
+++ branches/fusion-mg30/common/browserdetect.js	2015-06-14 14:08:48 UTC (rev 2917)
@@ -1,12 +1,16 @@
 var agent = navigator.userAgent.toLowerCase();
 var firefox = agent.indexOf("firefox") != -1;
 var opera = agent.indexOf("opera") != -1;
+var chrome = agent.indexOf("chrome") != -1;
 
 var safariIndex = agent.indexOf("safari");
 var safari1or2 = false;
 var safari3plus = false;
 var safari = false;
-if(safariIndex != -1)
+
+var macOS = navigator.appVersion.indexOf("Mac")!=-1;
+
+if(!chrome && safariIndex != -1)
 {
     safari = true;
     var safariVersion = agent.substr(safariIndex + 7, 3);
@@ -27,7 +31,8 @@
 if(msieIndex != -1)
 {
     msie = true;
-    var msieVersion = agent.substr(msieIndex + 5, 1);
+    var msieVersion = agent.substr(msieIndex + 5, 2);
+
     if(parseFloat(msieVersion) >= 7)
     {
         msie7plus = true;
@@ -37,3 +42,12 @@
         msie6minus = true;
     }
 }
+
+function getAttributeNodeValue(obj,attr){
+
+    if(obj[attr])
+        return obj[attr];
+    else
+        return obj.attributes[attr].nodeValue;
+
+}