mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-22 10:52:00 +02:00
fix diff to master
This commit is contained in:
parent
29481248d1
commit
1a49e30a02
@ -15,7 +15,7 @@
|
|||||||
import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
|
import {EgwApp, PushData} from '../../api/js/jsapi/egw_app';
|
||||||
import {etemplate2} from "../../api/js/etemplate/etemplate2";
|
import {etemplate2} from "../../api/js/etemplate/etemplate2";
|
||||||
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
|
import {Et2Dialog} from "../../api/js/etemplate/Et2Dialog/Et2Dialog";
|
||||||
import {egw, framework} from "../../api/js/jsapi/egw_global.js";
|
import {egw} from "../../api/js/jsapi/egw_global.js";
|
||||||
import {egwAction, egwActionObject} from '../../api/js/egw_action/egw_action';
|
import {egwAction, egwActionObject} from '../../api/js/egw_action/egw_action';
|
||||||
import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
|
import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch";
|
||||||
import {et2_DOMWidget} from "../../api/js/etemplate/et2_core_DOMWidget";
|
import {et2_DOMWidget} from "../../api/js/etemplate/et2_core_DOMWidget";
|
||||||
@ -195,7 +195,7 @@ class AdminApp extends EgwApp
|
|||||||
jQuery(this.ajax_target.getDOMNode()).empty();
|
jQuery(this.ajax_target.getDOMNode()).empty();
|
||||||
}
|
}
|
||||||
this.egw.json(
|
this.egw.json(
|
||||||
window.framework.activeApp.getMenuaction('ajax_exec', _url),
|
framework.activeApp.getMenuaction('ajax_exec', _url),
|
||||||
// It's important that the context is null, or etemplate2
|
// It's important that the context is null, or etemplate2
|
||||||
// won't load the template properly
|
// won't load the template properly
|
||||||
[_url], this._ajax_load_callback,null, true, this
|
[_url], this._ajax_load_callback,null, true, this
|
||||||
|
Loading…
x
Reference in New Issue
Block a user