extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing a couple of jQuery plugin includes

Browse Source 
thought jQueryUI-tooltip is still broken and we either need to legacy-load jQuery(UI) or fix the tooltip
This commit is contained in:
Ralf Becker 2021-07-01 16:33:15 +02:00
parent 8c7722c8b0
commit 68155251fa
8 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/js/egw_action/egw_action_popup.js
View File

@ -19,6 +19,7 @@ import {egwAction, egwActionImplementation, egwActionObject} from './egw_action.
import {egwFnct} from './egw_action_common.js'; import {egwFnct} from './egw_action_common.js';
import {egwMenu, _egw_active_menu} from "./egw_menu.js"; import {egwMenu, _egw_active_menu} from "./egw_menu.js";
import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants.js"; import {EGW_KEY_ENTER, EGW_KEY_MENU} from "./egw_action_constants.js";
import "../jquery/jquery-tap-and-hold/jquery.tapandhold.js";
if (typeof window._egwActionClasses == "undefined") if (typeof window._egwActionClasses == "undefined")
window._egwActionClasses = {}; window._egwActionClasses = {};

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

@ -755,7 +755,7 @@ export class et2_nextmatch_controller extends et2_dataview_controller implements
if(!this._widget) return; if(!this._widget) return;
// inform mobile framework about nm selections, need to update status of header objects on selection // inform mobile framework about nm selections, need to update status of header objects on selection
if (egwIsMobile()) framework.nm_onselect_ctrl(this._widget, action, senders); if (egwIsMobile()) window.framework.nm_onselect_ctrl(this._widget, action, senders);
this._widget.onselect.call(this._widget, action,senders); this._widget.onselect.call(this._widget, action,senders);
} }

1
api/js/etemplate/et2_widget_split.ts
View File

@ -21,6 +21,7 @@ import {ClassWithAttributes} from "./et2_core_inheritance";
import {et2_IPrint, et2_IResizeable} from "./et2_core_interfaces"; import {et2_IPrint, et2_IResizeable} from "./et2_core_interfaces";
import {et2_no_init} from "./et2_core_common"; import {et2_no_init} from "./et2_core_common";
import {et2_dynheight} from "./et2_widget_dynheight"; import {et2_dynheight} from "./et2_widget_dynheight";
import "../jquery/splitter.js";
/** /**
* A container widget that accepts 2 children, and puts a resize bar between them. * A container widget that accepts 2 children, and puts a resize bar between them.

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

@ -21,6 +21,8 @@ import {et2_dialog} from "./et2_widget_dialog";
import {egw, egw_get_file_editor_prefered_mimes} from "../jsapi/egw_global"; import {egw, egw_get_file_editor_prefered_mimes} from "../jsapi/egw_global";
import {et2_nextmatch} from "./et2_extension_nextmatch"; import {et2_nextmatch} from "./et2_extension_nextmatch";
import {ET2_DATAVIEW_STEPSIZE} from "./et2_dataview_controller"; import {ET2_DATAVIEW_STEPSIZE} from "./et2_dataview_controller";
import "../jquery/blueimp/js/blueimp-gallery.min.js";
import "../../../vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js";
type Constructor<T = {}> = new (...args: any[]) => T; type Constructor<T = {}> = new (...args: any[]) => T;

1
api/js/framework/fw_ui.js
View File

@ -16,6 +16,7 @@
import "../../../vendor/bower-asset/jquery/dist/jquery.min.js"; import "../../../vendor/bower-asset/jquery/dist/jquery.min.js";
import "../jquery/jquery.noconflict.js"; import "../jquery/jquery.noconflict.js";
import "../../../vendor/bower-asset/jquery-ui/jquery-ui.js"; import "../../../vendor/bower-asset/jquery-ui/jquery-ui.js";
import "../jquery/mousewheel/mousewheel.js";
import '../jsapi/egw_inheritance.js'; import '../jsapi/egw_inheritance.js';
import {EGW_KEY_ENTER, EGW_KEY_SPACE} from '../egw_action/egw_action_constants.js'; import {EGW_KEY_ENTER, EGW_KEY_SPACE} from '../egw_action/egw_action_constants.js';

13
api/js/jquery/jquery.noconflict.js
View File

@ -8,17 +8,4 @@
* @author Ralf Becker <rb@egroupware.org> * @author Ralf Becker <rb@egroupware.org>
*/ */
/*egw:uses
/vendor/bower-asset/jquery/dist/jquery.js;
/vendor/bower-asset/jquery-ui/jquery-ui.js;
/api/js/jquery/chosen/chosen.jquery.js;
/api/js/jquery/jquery-tab-and-hold/jquery.tabandhold.js;
/api/js/jquery/mousewheel/mousewheel.js;
/api/js/jquery/jquery-ui-timepicker-addon.js;
/vendor/bower-asset/jquery-touchswipe/jquery.touchSwipe.js;
/vendor/egroupware/magicsuggest/magicsuggest.js;
/api/js/jquery/splitter.js;
/api/js/jquery/blueimp/js/blueimp-gallery.min.js;
/api/js/Resumable/resumable.js;
*/
jQuery.noConflict(); jQuery.noConflict();

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

@ -78,7 +78,7 @@ window.app = {classes: {}};
window.egw_appName = egw_script.getAttribute('data-app'); window.egw_appName = egw_script.getAttribute('data-app');
// split includes in legacy js and modules // split includes in legacy js and modules
const legacy_js_regexp = /\/dhtmlx/; const legacy_js_regexp = /\/dhtmlx|jquery-ui/;
// check if egw object was injected by window open // check if egw object was injected by window open
if (typeof window.egw == 'undefined') if (typeof window.egw == 'undefined')

4
api/src/Framework/Bundle.php
View File

@ -123,6 +123,10 @@ class Bundle
{ {
$to_include[$file] = $path.'?'.$mod.($query ? '&'.$query : ''); $to_include[$file] = $path.'?'.$mod.($query ? '&'.$query : '');
} }
elseif (in_array($file, ['/api/js/jsapi.min.js', '/vendor/bower-asset/jquery/dist/jquery.min.js','/vendor/bower-asset/jquery/dist/jquery.js']))
{
error_log(function_backtrace()); // no NOT include
}
else else
{ {
$to_include[$file] = $path.($query ? '?'.$query : ''); $to_include[$file] = $path.($query ? '?'.$query : '');