extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

re-added daily cache-buster for app.js and removed explicit timepicker include causing a double include

Browse Source 
(we still sometimes get a jQuery.datepicker is not defined, but it seems a timing issue and is NOT fixed by including it twice!)
This commit is contained in:
Ralf Becker 2021-07-09 10:07:31 +02:00
parent fc0ad53916
commit 65502ace6e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_widget_date.ts
View File

@ -9,8 +9,6 @@
* @copyright Nathan Gray 2011 * @copyright Nathan Gray 2011
*/ */
// NEEDED by date widget
import "../jquery/jquery-ui-timepicker-addon.js";
import {et2_csvSplit, et2_no_init} from "./et2_core_common"; import {et2_csvSplit, et2_no_init} from "./et2_core_common";
import {ClassWithAttributes} from "./et2_core_inheritance"; import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_createWidget, et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget"; import {et2_createWidget, et2_register_widget, et2_widget, WidgetConfig} from "./et2_core_widget";

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

@ -538,7 +538,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// check if we need a not yet included app.js object --> include it now and return a Promise // check if we need a not yet included app.js object --> include it now and return a Promise
else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'undefined') else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'undefined')
{ {
return this.includeJS('/'+parts[1]+'/js/app.js', undefined, undefined, this.webserverUrl) return this.includeJS('/'+parts[1]+'/js/app.js?'+((new Date).valueOf()/86400|0).toString(), undefined, undefined, this.webserverUrl)
.then(() => this.applyFunc(_func, args, _context), .then(() => this.applyFunc(_func, args, _context),
(err) => {console.error("Failure loading /"+parts[1]+'/js/app.js' + " (" + err + ")\nAborting.")}); (err) => {console.error("Failure loading /"+parts[1]+'/js/app.js' + " (" + err + ")\nAborting.")});
} }