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

Deprecate $j global variable and replace them all with standard jQuery

Browse Source
This commit is contained in:
Hadi Nategh
2016-06-02 16:51:15 +02:00
parent d47e4889dc
commit 87fb94a496
103 changed files with 1123 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/js/jsapi/egw_json.js
View File

@ -118,7 +118,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// Send the request via AJAX using the jquery ajax function
// we need to use jQuery of window of egw object, as otherwise the one from main window is used!
// (causing eg. apply from server with app.$app.method to run in main window instead of popup)
this.request = (this.egw.window?this.egw.window.$j:$j).ajax({
this.request = (this.egw.window?this.egw.window.jQuery:jQuery).ajax({
url: this.url,
async: this.async,
context: this,
@ -163,8 +163,8 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
this.egw.includeJS(js_files, function() {
var end_time = (new Date).getTime();
this.handleResponse(data);
var gen_time_div = $j('#divGenTime_'+this.egw.appname);
if (!gen_time_div.length) gen_time_div = $j('.pageGenTime');
var gen_time_div = jQuery('#divGenTime_'+this.egw.appname);
if (!gen_time_div.length) gen_time_div = jQuery('.pageGenTime');
gen_time_div.append('<span class="asyncIncludeTime">'+egw.lang('async includes took %1s', (end_time-start_time)/1000)+'</span>');
}, this);
return;
@ -434,7 +434,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
{
try
{
var jQueryObject = $j(res.data.select, req.context);
var jQueryObject = jQuery(res.data.select, req.context);
jQueryObject[res.data.func].apply(jQueryObject, res.data.parms);
}
catch (e)