Author: awiner
Date: Tue Sep 19 08:45:59 2006
New Revision: 447888
URL: http://svn.apache.org/viewvc?view=rev&rev=447888
Log:
Applying second patch for ADFFACES-110
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?view=diff&rev=447888&r1=447887&r2=447888
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
Tue Sep 19 08:45:59 2006
@@ -276,22 +276,6 @@
kind = "gecko";
version = 1.0;
}
- else if ((agentString.indexOf('mozilla') != -1) &&
- (agentString.indexOf('spoofer') == -1) &&
- (agentString.indexOf('compatible') == -1))
- {
- if (version >= 5.0)
- {
- isGecko = true;
- kind = "gecko";
- version = 1.0;
- }
- else
- {
- isNav = true;
- kind = "nn";
- }
- }
else if(agentString.indexOf("blackberry") != -1)
{
// if we support non-BlackBerry Browser agents on blackberry
@@ -307,6 +291,22 @@
// leave the version as defined above
isBlackBerry = true;
kind = "blackberry";
+ }
+ else if ((agentString.indexOf('mozilla') != -1) &&
+ (agentString.indexOf('spoofer') == -1) &&
+ (agentString.indexOf('compatible') == -1))
+ {
+ if (version >= 5.0)
+ {
+ isGecko = true;
+ kind = "gecko";
+ version = 1.0;
+ }
+ else
+ {
+ isNav = true;
+ kind = "nn";
+ }
}
if (agentString.indexOf('win') != -1)
