extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 18:08:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert jQuery.noConflict() stuff as current aproach fails if minified

Browse Source
This commit is contained in:
Ralf Becker 2016-06-14 21:42:12 +02:00
parent 7bb87c2615
commit d40a3aa34f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/js/jsapi/egw.js
View File

@ -151,12 +151,7 @@
window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'}); window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'});
var include = JSON.parse(egw_script.getAttribute('data-include')); var include = JSON.parse(egw_script.getAttribute('data-include'));
var jquery = include.shift(); window.egw_LAB.script(include).wait(function()
window.egw_LAB.script([jquery]).wait(function(){
// tell jQuery to remove $, as EGroupware does NOT use it and it conflicts with eg. mootools
jQuery.noConflict();
}).script(include).wait(function()
{ {
// call egw.link_handler, if attr specified // call egw.link_handler, if attr specified
var egw_redirect = egw_script.getAttribute('data-egw-redirect'); var egw_redirect = egw_script.getAttribute('data-egw-redirect');