diff options
| author | sgiehl <stefan@piwik.org> | 2013-03-24 13:19:56 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2013-03-29 19:03:45 +0400 |
| commit | f3806a26b79dcc9b6157c14699558825e06e1eb6 (patch) | |
| tree | 1892ee90e7cac41dcbe0d99de08743cae18aa698 /libs/jquery | |
| parent | 174228ada77141319f88045df2e802d81897f0aa (diff) | |
refs #3813 readding jQuery.browser plugin, as it has been removed in 1.9
Diffstat (limited to 'libs/jquery')
| -rw-r--r-- | libs/jquery/MIT-LICENSE-tooltip.txt | 19 | ||||
| -rw-r--r-- | libs/jquery/jquery.browser.js | 4 | ||||
| -rw-r--r-- | libs/jquery/jquery.history.js | 2 |
3 files changed, 5 insertions, 20 deletions
diff --git a/libs/jquery/MIT-LICENSE-tooltip.txt b/libs/jquery/MIT-LICENSE-tooltip.txt deleted file mode 100644 index 3c74b589fc..0000000000 --- a/libs/jquery/MIT-LICENSE-tooltip.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2006 - 2008 Jörn Zaefferer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/libs/jquery/jquery.browser.js b/libs/jquery/jquery.browser.js new file mode 100644 index 0000000000..3431f7cf31 --- /dev/null +++ b/libs/jquery/jquery.browser.js @@ -0,0 +1,4 @@ +/*! jQuery Browser - v0.1.0 - 3/23/2012 +* https://github.com/jquery/jquery-browser +* Copyright (c) 2012 John Resig; Licensed MIT */ +(function(a){var b,c=navigator.userAgent||"";a.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},b=a.uaMatch(c),a.browser={},b.browser&&(a.browser[b.browser]=!0,a.browser.version=b.version),a.browser.webkit&&(a.browser.safari=!0)})(jQuery)
\ No newline at end of file diff --git a/libs/jquery/jquery.history.js b/libs/jquery/jquery.history.js index ffb4b420e1..305118bef8 100644 --- a/libs/jquery/jquery.history.js +++ b/libs/jquery/jquery.history.js @@ -168,7 +168,7 @@ var self = $.extend({}, implementations.base); - if($.browser && $.browser.msie && ($.browser.version < 8 || document.documentMode < 8)) { + if($.browser.msie && ($.browser.version < 8 || document.documentMode < 8)) { self.type = 'iframeTimer'; } else if("onhashchange" in window) { self.type = 'hashchangeEvent'; |