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

WIP of replacing bower-asset packages:

Browse Source 
- Get jquery-ui and touch event plugin working (although still modular import is not possible becuase of a wierd issue with jquery-ui tooltip plugin)
- Import timepicker-addon plugin as npm package
- Update composer.lock file
This commit is contained in:
Hadi Nategh 2021-08-12 14:51:38 +02:00
parent 72699fad30
commit d07a7ab194
14 changed files with 794 additions and 2229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Gruntfile.js
View File

@ -41,7 +41,7 @@ module.exports = function (grunt) {
files: { files: {
"pixelegg/css/pixelegg.min.css": [ "pixelegg/css/pixelegg.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -59,7 +59,7 @@ module.exports = function (grunt) {
], ],
"pixelegg/css/mobile.min.css": [ "pixelegg/css/mobile.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -77,7 +77,7 @@ module.exports = function (grunt) {
], ],
"pixelegg/mobile/fw_mobile.min.css": [ "pixelegg/mobile/fw_mobile.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -94,7 +94,7 @@ module.exports = function (grunt) {
], ],
"pixelegg/css/monochrome.min.css": [ "pixelegg/css/monochrome.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -112,7 +112,7 @@ module.exports = function (grunt) {
], ],
"pixelegg/css/modern.min.css": [ "pixelegg/css/modern.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -134,7 +134,7 @@ module.exports = function (grunt) {
files: { files: {
"jdots/css/high-contrast.min.css": [ "jdots/css/high-contrast.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -155,7 +155,7 @@ module.exports = function (grunt) {
], ],
"jdots/css/jdots.min.css": [ "jdots/css/jdots.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",
@ -175,7 +175,7 @@ module.exports = function (grunt) {
], ],
"jdots/css/orange-green.min.css": [ "jdots/css/orange-green.min.css": [
"api/js/jquery/chosen/chosen.css", "api/js/jquery/chosen/chosen.css",
"vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css", "node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css",
"vendor/egroupware/magicsuggest/magicsuggest.css", "vendor/egroupware/magicsuggest/magicsuggest.css",
"api/js/jquery/jquery-ui-timepicker-addon.css", "api/js/jquery/jquery-ui-timepicker-addon.css",
"api/js/jquery/blueimp/css/blueimp-gallery.min.css", "api/js/jquery/blueimp/css/blueimp-gallery.min.css",

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

@ -13,7 +13,6 @@
egw_action_common; egw_action_common;
egw_action_popup; egw_action_popup;
vendor.bower-asset.jquery.dist.jquery; vendor.bower-asset.jquery.dist.jquery;
/vendor/bower-asset/jquery-ui/jquery-ui.js;
*/ */
import {egwAction,egwActionImplementation} from "./egw_action.js"; import {egwAction,egwActionImplementation} from "./egw_action.js";

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

@ -12,7 +12,6 @@
/*egw:uses /*egw:uses
/vendor/bower-asset/jquery/dist/jquery.js; /vendor/bower-asset/jquery/dist/jquery.js;
/vendor/bower-asset/jquery-ui/jquery-ui.js;
et2_core_inputWidget; et2_core_inputWidget;
et2_core_valueWidget; et2_core_valueWidget;
*/ */

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|jquery-ui/; const legacy_js_regexp = /\/dhtmlx|jquery-ui-dist/;
// 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')

3
api/js/jsapi/egw_calendar.js
View File

@ -10,7 +10,6 @@
*/ */
/*egw:uses /*egw:uses
/vendor/bower-asset/jquery-ui/jquery-ui.js;
jquery.jquery-ui-timepicker-addon; jquery.jquery-ui-timepicker-addon;
egw_core; egw_core;
@ -19,8 +18,6 @@
egw_css; egw_css;
*/ */
import "../../../vendor/bower-asset/jquery/dist/jquery.min.js";
//import "../../../vendor/bower-asset/jquery-ui/jquery-ui.js";
import "../jquery/jquery.noconflict.js"; import "../jquery/jquery.noconflict.js";
//import "../jquery/jquery-ui-timepicker-addon.js"; //import "../jquery/jquery-ui-timepicker-addon.js";
import './egw_core.js'; import './egw_core.js';

6
api/src/Framework.php
View File

@ -1003,7 +1003,7 @@ abstract class Framework extends Framework\Extra
self::includeCSS('/api/js/jquery/chosen/chosen.css'); self::includeCSS('/api/js/jquery/chosen/chosen.css');
// eTemplate2 uses jQueryUI, so load it first so et2 can override if needed // eTemplate2 uses jQueryUI, so load it first so et2 can override if needed
self::includeCSS("/vendor/bower-asset/jquery-ui/themes/redmond/jquery-ui.css"); self::includeCSS("/node_modules/jquery-ui-themes/themes/redmond/jquery-ui.css");
// eTemplate2 - load in top so sidebox has styles too // eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/api/templates/default/etemplate2.css'); self::includeCSS('/api/templates/default/etemplate2.css');
@ -1074,8 +1074,8 @@ abstract class Framework extends Framework\Extra
)); ));
} }
// manually load old legacy javascript dhtmlx & jQuery-UI via script tag // manually load old legacy javascript dhtmlx & jQuery-UI via script tag
self::includeJS('/vendor/bower-asset/jquery-ui/jquery-ui.js'); self::includeJS('/node_modules/jquery-ui-dist/jquery-ui.min.js');
self::includeJS('/api/js/jquery/jquery-ui-timepicker-addon.js'); self::includeJS('/node_modules/jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js');
self::includeJS('/api/js/dhtmlxtree/codebase/dhtmlxcommon.js'); self::includeJS('/api/js/dhtmlxtree/codebase/dhtmlxcommon.js');
self::includeJS('/api/js/dhtmlxMenu/sources/dhtmlxmenu.js'); self::includeJS('/api/js/dhtmlxMenu/sources/dhtmlxmenu.js');
self::includeJS('/api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js'); self::includeJS('/api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js');

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

@ -241,7 +241,7 @@ class Bundle
// generate api bundle // generate api bundle
$inc_mgr->include_js_file('/vendor/bower-asset/jquery/dist/jquery.js'); $inc_mgr->include_js_file('/vendor/bower-asset/jquery/dist/jquery.js');
$inc_mgr->include_js_file('/api/js/jquery/jquery.noconflict.js'); $inc_mgr->include_js_file('/api/js/jquery/jquery.noconflict.js');
$inc_mgr->include_js_file('/vendor/bower-asset/jquery-ui/jquery-ui.js'); $inc_mgr->include_js_file('/node_modules/jquery-ui-dist/jquery-ui.min.js');
$inc_mgr->include_js_file('/api/js/jsapi/jsapi.js'); $inc_mgr->include_js_file('/api/js/jsapi/jsapi.js');
$inc_mgr->include_js_file('/api/js/egw_json.js'); $inc_mgr->include_js_file('/api/js/egw_json.js');
$inc_mgr->include_js_file('/api/js/jsapi/egw.js'); $inc_mgr->include_js_file('/api/js/jsapi/egw.js');

2
calendar/templates/default/app.css
View File

@ -85,7 +85,7 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
background-color: transparent; background-color: transparent;
background-image: url(../../../vendor/bower-asset/jquery-ui/themes/redmond/images/ui-icons_469bdd_256x240.png); background-image: url(../../../node_modules/jquery-ui-themes/themes/redmond/images/ui-icons_469bdd_256x240.png);
border: none; border: none;
box-shadow: none; box-shadow: none;
} }

2
calendar/templates/mobile/app.css
View File

@ -107,7 +107,7 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
background-color: transparent; background-color: transparent;
background-image: url(../../../vendor/bower-asset/jquery-ui/themes/redmond/images/ui-icons_469bdd_256x240.png); background-image: url(../../../node_modules/jquery-ui-themes/themes/redmond/images/ui-icons_469bdd_256x240.png);
border: none; border: none;
box-shadow: none; box-shadow: none;
} }

2
calendar/templates/pixelegg/app.css
View File

@ -95,7 +95,7 @@
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
background-color: transparent; background-color: transparent;
background-image: url(../../../vendor/bower-asset/jquery-ui/themes/redmond/images/ui-icons_469bdd_256x240.png); background-image: url(../../../node_modules/jquery-ui-themes/themes/redmond/images/ui-icons_469bdd_256x240.png);
border: none; border: none;
box-shadow: none; box-shadow: none;
} }

1
composer.json
View File

@ -77,7 +77,6 @@
"bower-asset/fastclick": "1.0.*", "bower-asset/fastclick": "1.0.*",
"bower-asset/jquery": "^1.12.4", "bower-asset/jquery": "^1.12.4",
"bower-asset/jquery-touchswipe": "1.6.*", "bower-asset/jquery-touchswipe": "1.6.*",
"bower-asset/jquery-ui": "=1.12.1",
"egroupware/activesync": "self.version", "egroupware/activesync": "self.version",
"egroupware/adodb-php": "self.version", "egroupware/adodb-php": "self.version",
"egroupware/bookmarks": "self.version", "egroupware/bookmarks": "self.version",

797
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2182
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -45,8 +45,10 @@
} }
}, },
"dependencies": { "dependencies": {
"carbon-components": "^10.37.0", "@andxor/jquery-ui-touch-punch-fix": "^1.0.2",
"carbon-web-components": "^1.14.1", "jquery-ui-dist": "^1.12.1",
"jquery-ui-themes": "^1.12.0",
"jquery-ui-timepicker-addon": "^1.6.3",
"lit-element": "^2.5.1", "lit-element": "^2.5.1",
"lit-html": "^1.4.1", "lit-html": "^1.4.1",
"sortablejs": "^1.14.0" "sortablejs": "^1.14.0"