You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2015/05/20 17:44:16 UTC

svn commit: r1680608 - /myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js

Author: mkienenb
Date: Wed May 20 15:44:16 2015
New Revision: 1680608

URL: http://svn.apache.org/r1680608
Log:
TRINIDAD-2523 Agent Initialization in JavaScript does not support IE11 (Thanks to  Akash for providing the patch)

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=1680608&r1=1680607&r2=1680608&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Wed May 20 15:44:16 2015
@@ -247,11 +247,18 @@ function _agentInit()
   // Indicate browser's validation capability support
   var supportsValidation  = true;
 
-  if (agentString.indexOf("msie") != -1)
+  if (agentString.indexOf("msie") != -1
+			|| agentString.indexOf("trident") != -1)
   {
+    var matches = null;
     // extract ie's version from the ie string
-    var matches = agentString.match(/msie (.*);/);
-    version = parseFloat(matches[1]);
+    if (agentString.indexOf("msie") != -1) {
+        matches = agentString.match(/msie (.*);/);
+        version = parseFloat(matches[1]);
+    } else if (agentString.indexOf("trident") != -1) {
+        matches = agentString.match(/trident\/(.*);/);
+        version = parseFloat(matches[1]) + 4.0;
+    }
     isIEGroup = true;
 
     // All IE based mobile browsers