TOBAGO-2012: Translate popup implementation from bootstrap to Typescript
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/package-lock.json b/tobago-theme/tobago-theme-standard/src/main/npm/package-lock.json
index ed5bbe7..613bc07 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/package-lock.json
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/package-lock.json
@@ -1228,15 +1228,6 @@
"integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==",
"dev": true
},
- "@types/jquery": {
- "version": "3.3.29",
- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.29.tgz",
- "integrity": "sha512-FhJvBninYD36v3k6c+bVk1DSZwh7B5Dpb/Pyk3HKVsiohn0nhbefZZ+3JXbWQhFyt0MxSl2jRDdGQPHeOHFXrQ==",
- "dev": true,
- "requires": {
- "@types/sizzle": "*"
- }
- },
"@types/minimatch": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -1258,12 +1249,6 @@
"@types/node": "*"
}
},
- "@types/sizzle": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
- "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
- "dev": true
- },
"@types/stack-utils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -3164,8 +3149,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -3186,14 +3170,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3208,20 +3190,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3338,8 +3317,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -3351,7 +3329,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -3366,7 +3343,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -3374,14 +3350,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -3400,7 +3374,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3481,8 +3454,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -3494,7 +3466,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -3580,8 +3551,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3617,7 +3587,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3637,7 +3606,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3681,14 +3649,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -5123,12 +5089,6 @@
}
}
},
- "jquery": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
- "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==",
- "dev": true
- },
"js-base64": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
@@ -6342,9 +6302,9 @@
"dev": true
},
"popper.js": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz",
- "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz",
+ "integrity": "sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==",
"dev": true
},
"posix-character-classes": {
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/package.json b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
index 6e27eef..8797af8 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/package.json
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/package.json
@@ -38,7 +38,6 @@
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@types/jest": "^24.0.13",
- "@types/jquery": "^3.3.29",
"ajv": "^6.10.0",
"ajv-keywords": "^3.4.0",
"autoprefixer": "^9.5.1",
@@ -49,7 +48,6 @@
"eslint": "^5.16.0",
"eslint-plugin-compat": "^3.1.1",
"jest": "24.8.0",
- "jquery": "^3.4.1",
"moment": "^2.24.0",
"node-sass": "^4.12.0",
"npm-run-all": "^4.1.5",
diff --git a/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-popup.ts b/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-popup.ts
index c10c340..a1c97c5 100644
--- a/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-popup.ts
+++ b/tobago-theme/tobago-theme-standard/src/main/npm/ts/tobago-popup.ts
@@ -185,12 +185,12 @@
// this._setEscapeEvent();
// this._setResizeEvent();
- $(document).off(Event.FOCUSIN);
+ // $(document).off(Event.FOCUSIN);
this.classList.remove(ClassName.SHOW);
this.removeEventListener(Event.CLICK_DISMISS, this._clickDismiss);
- $(this._dialog).off(Event.MOUSEDOWN_DISMISS);
+ // $(this._dialog).off(Event.MOUSEDOWN_DISMISS);
// if (transition) {
// const transitionDuration = this.getTransitionDuration();
@@ -267,7 +267,7 @@
this.removeAttribute("aria-hidden");
this.setAttribute("aria-modal", "true");
- if ($(this._dialog).hasClass(ClassName.SCROLLABLE) && modalBody) {
+ if (this._dialog.classList.contains(ClassName.SCROLLABLE) && modalBody) {
modalBody.scrollTop = 0;
} else {
this.scrollTop = 0;
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index a30846f..8a11449 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -39,7 +39,7 @@
<resources production="true">
<includes>
<script name="/webjars/webcomponents__custom-elements/1.2.1/custom-elements.min.js"/>
- <script name="/webjars/jquery/3.4.1/jquery.min.js"/>
+<!-- <script name="/webjars/jquery/3.4.1/jquery.min.js"/>-->
<script name="/webjars/tether/1.4.0/js/tether.min.js"/>
<script name="/webjars/popper.js/1.14.3/umd/popper.min.js"/>
<script name="/webjars/momentjs/2.24.0/min/moment-with-locales.min.js"/>
@@ -54,7 +54,7 @@
<resources production="false">
<includes>
<script name="/webjars/webcomponents__custom-elements/1.2.1/externs/custom-elements.js"/>
- <script name="/webjars/jquery/3.4.1/jquery.js"/>
+<!-- <script name="/webjars/jquery/3.4.1/jquery.js"/>-->
<script name="/webjars/tether/1.4.0/js/tether.js"/>
<script name="/webjars/popper.js/1.14.3/umd/popper.js"/>
<script name="/webjars/momentjs/2.24.0/min/moment-with-locales.js"/>
