Index: swfaddress/src/js/SWFAddress.js =================================================================== --- swfaddress/src/js/SWFAddress.js (revision 702) +++ swfaddress/src/js/SWFAddress.js (working copy) @@ -90,7 +90,7 @@ if (typeof timeout != UNDEFINED) clearTimeout(timeout); if (_ids.length != 0 && - _util.Browser.isFirefox() && + _util.Browser.isGecko() && navigator.userAgent.indexOf('Mac') != -1) timeout = setTimeout(function() { _webaddress[method].call(SWFAddress, value); Index: swfaddress/src/js/Browser.js =================================================================== --- swfaddress/src/js/Browser.js (revision 702) +++ swfaddress/src/js/Browser.js (working copy) @@ -16,12 +16,11 @@ var _version = -1, _agent = navigator.userAgent, - _ie = false, - _camino = false, + _ie = false, _safari = false, _opera = false, - _firefox = false, - _chrome = false; + _chrome = false, + _gecko = false; var _getVersion = function(s, i) { return parseFloat(_agent.substr(_agent.indexOf(s) + i)); @@ -36,14 +35,11 @@ if (_chrome = /Chrome/.test(_agent)) _version = _getVersion('Chrome', 7); - if (_camino = /Camino/.test(_agent)) - _version = _getVersion('Camino', 7); - if (_safari = (/AppleWebKit/.test(_agent) && !_chrome)) _version = _getVersion('Safari', 7); - if (_firefox = (/Firefox/.test(_agent) && !_camino)) - _version = _getVersion('Firefox', 8); + if (_gecko = (navigator && navigator.product == "Gecko" && !_chrome && !_safari)) + _version = _getVersion('rv:', 3); /** * The string representation of this class. @@ -91,24 +87,15 @@ } /** - * Detects if the browser is Camino. + * Detects if the browser is Gecko-based. * @return {Boolean} * @static */ - this.isCamino = function() { - return _camino; + this.isGecko = function() { + return _gecko; } /** - * Detects if the browser is Firefox. - * @return {Boolean} - * @static - */ - this.isFirefox = function() { - return _firefox; - } - - /** * Detects if the browser is Chrome. * @return {Boolean} * @static Index: swfaddress/src/js/WEBAddress.js =================================================================== --- swfaddress/src/js/WEBAddress.js (revision 702) +++ swfaddress/src/js/WEBAddress.js (working copy) @@ -59,11 +59,8 @@ if (_browser.isChrome()) _supported = _version >= 0.2; - if (_browser.isCamino()) + if (_browser.isGecko()) _supported = _version >= 1; - - if (_browser.isFirefox()) - _supported = _version >= 1; if ((!_supported && _l.href.indexOf('#') != -1) || (_browser.isSafari() && _version < 418 && _l.href.indexOf('#') != -1 && _l.search != '')){ @@ -432,7 +429,7 @@ _iframe.contentWindow.document.title = title; _juststart = false; } - if (!_justset && (_browser.isCamino() || _browser.isFirefox())) + if (!_justset && _browser.isGecko()) _l.replace(_l.href.indexOf('#') != -1 ? _l.href : _l.href + '#'); _justset = false; }, 50);