mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-08-19 04:46:42 +02:00
got et2 mostly working: timesheet.edit renders
This commit is contained in:
@@ -344,9 +344,9 @@
|
||||
};
|
||||
|
||||
// rest needs DOM to be ready
|
||||
jQuery(function() {
|
||||
jQuery(function() {import('../etemplate/etemplate2.js').then(function(module){
|
||||
// load etemplate2 template(s)
|
||||
jQuery('form.et2_container[data-etemplate]').each(function(index, node){
|
||||
jQuery('form.et2_container[data-etemplate]').each( function(index, node){
|
||||
var data = JSON.parse(node.getAttribute('data-etemplate')) || {};
|
||||
var currentapp = data.data.currentapp || window.egw_appName;
|
||||
if(popup || window.opener && !egwIsMobile())
|
||||
@@ -366,7 +366,7 @@
|
||||
}
|
||||
});
|
||||
}
|
||||
var et2 = new etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content");
|
||||
const et2 = new module.etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content");
|
||||
et2.load(data.name,data.url,data.data);
|
||||
if (typeof data.response != 'undefined')
|
||||
{
|
||||
@@ -379,7 +379,7 @@
|
||||
if (typeof window.Offline != 'undefined')
|
||||
{
|
||||
Offline.options = {
|
||||
// Should we check the connection status immediatly on page load.
|
||||
// Should we check the connection status immediately on page load.
|
||||
checkOnLoad: false,
|
||||
|
||||
// Should we monitor AJAX requests to help decide if we have a connection.
|
||||
@@ -474,7 +474,7 @@
|
||||
catch(e) {
|
||||
// ignore SecurityError exception if top is different security context / cross-origin
|
||||
}
|
||||
});
|
||||
})});
|
||||
}, (e) => alert(e.message+"\n\n"+e.stack));
|
||||
//
|
||||
window.egw_LAB.wait = window.egw_ready.then;
|
||||
|
@@ -4,13 +4,13 @@
|
||||
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
||||
* @package etemplate
|
||||
* @subpackage api
|
||||
* @link http://www.egroupware.org
|
||||
* @link https://www.egroupware.org
|
||||
* @author Ralf Becker <rb@egroupware.org>
|
||||
* @author Hadi Nategh <hn@groupware.org>
|
||||
* @author Nathan Gray <ng@groupware.org>
|
||||
*/
|
||||
import 'jquery';
|
||||
import 'jqueryui';
|
||||
import '../../../vendor/bower-asset/jquery/dist/jquery.js';
|
||||
import '../../../vendor/bower-asset/jquery-ui/jquery-ui.js';
|
||||
import { etemplate2 } from "../etemplate/etemplate2";
|
||||
import { et2_nextmatch } from "../etemplate/et2_extension_nextmatch";
|
||||
import { et2_dialog } from "../etemplate/et2_widget_dialog";
|
||||
|
@@ -4,21 +4,21 @@
|
||||
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
||||
* @package etemplate
|
||||
* @subpackage api
|
||||
* @link http://www.egroupware.org
|
||||
* @link https://www.egroupware.org
|
||||
* @author Ralf Becker <rb@egroupware.org>
|
||||
* @author Hadi Nategh <hn@groupware.org>
|
||||
* @author Nathan Gray <ng@groupware.org>
|
||||
*/
|
||||
|
||||
import 'jquery';
|
||||
import 'jqueryui';
|
||||
import '../jsapi/egw_global';
|
||||
import '../../../vendor/bower-asset/jquery/dist/jquery.js';
|
||||
import '../../../vendor/bower-asset/jquery-ui/jquery-ui.js';
|
||||
import {etemplate2} from "../etemplate/etemplate2";
|
||||
import {et2_container} from "../etemplate/et2_core_baseWidget";
|
||||
import type {et2_container} from "../etemplate/et2_core_baseWidget";
|
||||
import {et2_nextmatch} from "../etemplate/et2_extension_nextmatch";
|
||||
import {et2_dialog} from "../etemplate/et2_widget_dialog";
|
||||
import {et2_createWidget} from "../etemplate/et2_core_widget";
|
||||
import {et2_favorites} from "../etemplate/et2_widget_favorites";
|
||||
import type {IegwAppLocal} from "./egw_global";
|
||||
|
||||
/**
|
||||
* Type for push-message
|
||||
|
@@ -7,7 +7,6 @@
|
||||
* @link http://www.egroupware.org
|
||||
* @author Andreas Stöckel (as AT stylite.de)
|
||||
* @author Ralf Becker <RalfBecker@outdoor-training.de>
|
||||
* @version $Id$
|
||||
*/
|
||||
|
||||
/*egw:uses
|
||||
@@ -20,6 +19,8 @@
|
||||
egw_css;
|
||||
*/
|
||||
import './egw_core.js';
|
||||
import 'jqueryui';
|
||||
import '../jquery/jquery-ui-timepicker-addon.js';
|
||||
|
||||
/**
|
||||
* Date and timepicker
|
||||
|
6
api/js/jsapi/egw_global.js
Normal file
6
api/js/jsapi/egw_global.js
Normal file
@@ -0,0 +1,6 @@
|
||||
export var app = window.app;
|
||||
export var egw = window.egw;
|
||||
export var framework = window.framework;
|
||||
export var egw_get_file_editor_prefered_mimes = window.egw_get_file_editor_prefered_mimes;
|
||||
export var egw_getFramework = window.egw_getFramework;
|
||||
export var jQuery = window.jQuery;
|
Reference in New Issue
Block a user