diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-07-20 08:33:36 +0400 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2009-07-20 08:33:36 +0400 |
| commit | fa72c18240b9bbb361f968f8e4f96e2ec2c2e344 (patch) | |
| tree | 9637e61ac086b1d335e618ca4ff92d083ffe3cfa /js | |
| parent | f95d198f64473f428a0d506e34b0ecc85d7afbbe (diff) | |
fixes #857 - add Silverlight and Google Gears detection; revert #744 & #683, restoring Java and Quicktime detection given #852. Kept "Cookie". AIR not detectable.
Diffstat (limited to 'js')
| -rw-r--r-- | js/piwik.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/js/piwik.js b/js/piwik.js index cfb9964bc4..0863f56dc1 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -203,11 +203,16 @@ if (!this.Piwik) { // document types pdf: ['pdf', 'application/pdf', '0'], // media players + quicktime: ['qt', 'video/quicktime', '0'], realplayer: ['realp', 'audio/x-pn-realaudio-plugin', '0'], wma: ['wma', 'application/x-mplayer2', '0'], // interactive multimedia director: ['dir', 'application/x-director', '0'], - flash: ['fla', 'application/x-shockwave-flash', '0'] + flash: ['fla', 'application/x-shockwave-flash', '0'], + // RIA + java: ['java', 'application/x-java-vm', '0'], + gears: ['gears', 'application/x-googlegears', '0'], + silverlight: ['ag', 'application/x-silverlight', '0'] }, // Guard against installing the link tracker more than once per Tracker instance @@ -341,16 +346,6 @@ if (!this.Piwik) { registeredHooks = {}; /* - * Platform test for Internet Explorer on Windows - */ - function isWindowsIE() { - var agent = navigatorAlias.userAgent.toLowerCase(); - - return (agent.indexOf('msie') != -1) && (agent.indexOf('opera') == -1) && - ((agent.indexOf('win') != -1) || (agent.indexOf('32bit') != -1)); - } - - /* * Set cookie value */ function setCookie(cookieName, value, daysToExpire, path, domain, secure) { @@ -420,6 +415,11 @@ if (!this.Piwik) { pluginMap.java[2] = '1'; } + // Firefox + if (typeof windowAlias.GearsFactory === 'function') { + pluginMap.gears[2] = '1'; + } + if (navigatorAlias.mimeTypes && navigatorAlias.mimeTypes.length) { for (i in pluginMap) { mimeType = navigatorAlias.mimeTypes[pluginMap[i][1]]; |