diff options
author | friendica <info@friendica.com> | 2013-11-25 19:07:58 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-11-25 19:07:58 -0800 |
commit | 95824642a643ccee269f7bf1a5ac570bc966a2e2 (patch) | |
tree | a8528d242d77a0c3375b27e775908a9dca657fb0 /js | |
parent | bed0bca4d7e49a389b27e4dad089b47ede2e1e9e (diff) | |
download | volse-hubzilla-95824642a643ccee269f7bf1a5ac570bc966a2e2.tar.gz volse-hubzilla-95824642a643ccee269f7bf1a5ac570bc966a2e2.tar.bz2 volse-hubzilla-95824642a643ccee269f7bf1a5ac570bc966a2e2.zip |
make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit.
Diffstat (limited to 'js')
-rw-r--r-- | js/main.js | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/js/main.js b/js/main.js index f9dc95daa..e1769f77a 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,3 +1203,42 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } + +// provide jquery.browser so we can get rid of the migration toolkit + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + + +// Don't clobber any existing jQuery.browser in case it's different +if ( !jQuery.browser ) { + matched = jQuery.uaMatch( navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + } + + // Chrome is Webkit, but Webkit is also Safari. + if ( browser.chrome ) { + browser.webkit = true; + } else if ( browser.webkit ) { + browser.safari = true; + } + + jQuery.browser = browser; +} |