From 0730d4880ee546f7ceca6c7206a0a06293d8b946 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 10 Jun 2021 13:16:31 +0200 Subject: [PATCH] Remove couple of more jquery import statements --- addressbook/js/CRM.js | 2 -- addressbook/js/CRM.ts | 3 --- addressbook/js/app.js | 2 -- addressbook/js/app.ts | 3 --- api/js/etemplate/et2_widget_taglist.js | 1 - api/js/etemplate/et2_widget_taglist.ts | 2 -- api/js/jquery/chosen/chosen.jquery.js | 8 ++++---- notifications/js/notificationajaxpopup.js | 2 -- timesheet/js/app.js | 2 -- timesheet/js/app.ts | 3 --- 10 files changed, 4 insertions(+), 24 deletions(-) diff --git a/addressbook/js/CRM.js b/addressbook/js/CRM.js index 2895f35a51..c1684689f1 100644 --- a/addressbook/js/CRM.js +++ b/addressbook/js/CRM.js @@ -11,8 +11,6 @@ /*egw:uses /api/js/jsapi/egw_app.js */ -import 'jquery'; -import 'jqueryui'; import { EgwApp } from '../../api/js/jsapi/egw_app'; import { et2_nextmatch } from "../../api/js/etemplate/et2_extension_nextmatch"; /** diff --git a/addressbook/js/CRM.ts b/addressbook/js/CRM.ts index 36e136bc46..caacc748b1 100644 --- a/addressbook/js/CRM.ts +++ b/addressbook/js/CRM.ts @@ -13,9 +13,6 @@ /api/js/jsapi/egw_app.js */ -import 'jquery'; -import 'jqueryui'; - import {EgwApp, PushData} from '../../api/js/jsapi/egw_app'; import {etemplate2} from "../../api/js/etemplate/etemplate2"; import {et2_nextmatch} from "../../api/js/etemplate/et2_extension_nextmatch"; diff --git a/addressbook/js/app.js b/addressbook/js/app.js index 5eb11616b0..98415e88c9 100644 --- a/addressbook/js/app.js +++ b/addressbook/js/app.js @@ -11,8 +11,6 @@ /*egw:uses /api/js/jsapi/egw_app.js */ -import 'jquery'; -import 'jqueryui'; import { EgwApp } from '../../api/js/jsapi/egw_app'; import { etemplate2 } from "../../api/js/etemplate/etemplate2"; import { et2_dialog } from "../../api/js/etemplate/et2_widget_dialog"; diff --git a/addressbook/js/app.ts b/addressbook/js/app.ts index 99eb895fd3..51441f137d 100644 --- a/addressbook/js/app.ts +++ b/addressbook/js/app.ts @@ -13,9 +13,6 @@ /api/js/jsapi/egw_app.js */ -import 'jquery'; -import 'jqueryui'; - import {EgwApp, PushData} from '../../api/js/jsapi/egw_app'; import {etemplate2} from "../../api/js/etemplate/etemplate2"; import {et2_dialog} from "../../api/js/etemplate/et2_widget_dialog"; diff --git a/api/js/etemplate/et2_widget_taglist.js b/api/js/etemplate/et2_widget_taglist.js index 125c31e059..7cb7f8b366 100644 --- a/api/js/etemplate/et2_widget_taglist.js +++ b/api/js/etemplate/et2_widget_taglist.js @@ -18,7 +18,6 @@ import { ClassWithAttributes } from "./et2_core_inheritance"; import { et2_evalBool, et2_no_init } from "./et2_core_common"; import { et2_url } from "./et2_widget_url"; import { egw } from "../jsapi/egw_global"; -import "../../../vendor/egroupware/magicsuggest/magicsuggest.js"; /** * Tag list widget * diff --git a/api/js/etemplate/et2_widget_taglist.ts b/api/js/etemplate/et2_widget_taglist.ts index 7d4867cac3..5537dd61a3 100644 --- a/api/js/etemplate/et2_widget_taglist.ts +++ b/api/js/etemplate/et2_widget_taglist.ts @@ -21,8 +21,6 @@ import {et2_IResizeable} from "./et2_core_interfaces"; import {et2_evalBool, et2_no_init} from "./et2_core_common"; import {et2_url} from "./et2_widget_url"; import {egw} from "../jsapi/egw_global"; -import "../../../vendor/egroupware/magicsuggest/magicsuggest.js"; - /** * Tag list widget * diff --git a/api/js/jquery/chosen/chosen.jquery.js b/api/js/jquery/chosen/chosen.jquery.js index 3ed19c9b16..403d2d60cd 100644 --- a/api/js/jquery/chosen/chosen.jquery.js +++ b/api/js/jquery/chosen/chosen.jquery.js @@ -113,7 +113,7 @@ this.SelectParser = SelectParser; -}).call(window); +}).call(this); (function() { var AbstractChosen, root; @@ -458,9 +458,9 @@ root.AbstractChosen = AbstractChosen; -}).call(window); +}).call(this); -(function(jQuery) { +(function() { var $, Chosen, root, _ref, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; @@ -1211,4 +1211,4 @@ root.Chosen = Chosen; -}).call(window, jQuery); +}).call(this); diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js index c0818adae9..37600b11fd 100644 --- a/notifications/js/notificationajaxpopup.js +++ b/notifications/js/notificationajaxpopup.js @@ -11,8 +11,6 @@ 'use strict'; -import '../../vendor/bower-asset/jquery/dist/jquery.js'; - /** * Installs app.notifications used to poll notifications from server and display them */ diff --git a/timesheet/js/app.js b/timesheet/js/app.js index 738d935c34..d8769eb440 100644 --- a/timesheet/js/app.js +++ b/timesheet/js/app.js @@ -10,8 +10,6 @@ /*egw:uses /api/js/jsapi/egw_app.js */ -import 'jquery'; -import 'jqueryui'; import '../../api/js/jsapi/egw_global'; import { EgwApp } from '../../api/js/jsapi/egw_app'; /** diff --git a/timesheet/js/app.ts b/timesheet/js/app.ts index fc0bd1a3de..6687c3657a 100644 --- a/timesheet/js/app.ts +++ b/timesheet/js/app.ts @@ -11,9 +11,6 @@ /*egw:uses /api/js/jsapi/egw_app.js */ - -import 'jquery'; -import 'jqueryui'; import '../../api/js/jsapi/egw_global'; import {EgwApp} from '../../api/js/jsapi/egw_app';