From: Alexander Ebert Date: Tue, 28 Oct 2014 21:47:22 +0000 (+0100) Subject: Fixed jQuery.browser X-Git-Tag: 2.1.0_Alpha_1~143 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=60f1af30a63d98c3155c0bb58da22e2a1d42e891;p=GitHub%2FWoltLab%2FWCF.git Fixed jQuery.browser --- diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 79a2943e52..f562992001 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -151,7 +151,8 @@ function shuffle(array) { browser.safari = true; } - jQuery.browser = browser; + jQuery.browser = jQuery.browser || { }; + jQuery.browser = $.extend(jQuery.browser, browser); jQuery.browser.touch = (!!('ontouchstart' in window) || (!!('msMaxTouchPoints' in window.navigator) && window.navigator.msMaxTouchPoints > 0)); // detect smartphones