[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] 2 commits: [UPD] element plus patch for still not pinned version. Partial backport of MR 9327
Benoit Grégoire (@benoitg) via TikiWiki-cvs <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <697cfafabed7c_3b183df020961@gitlab-sidekiq-low-urgency-cpu-bound-v2-74d9db67b-snjgq.mail> |
Benoit Grégoire pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki
Commits:
1f7a1be3 by Benoit Grégoire at 2026-01-30T18:32:08+00:00
[UPD] element plus patch for still not pinned version. Partial backport of MR 9327
- - - - -
59239781 by Benoit Grégoire at 2026-01-30T18:32:08+00:00
[UPD] Re-generate package-lock.json again
- - - - -
2 changed files:
- package-lock.json
- src/js/patches/element-plus+2.11.3.patch → src/js/patches/element-plus+2.13.0.patch
Changes:
=====================================
package-lock.json
=====================================
The diff for this file was not included because it is too large.
=====================================
src/js/patches/element-plus+2.11.3.patch → src/js/patches/element-plus+2.13.0.patch
=====================================
@@ -1,8 +1,8 @@
diff --git a/node_modules/element-plus/es/components/tooltip/src/content2.mjs b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-index 00f7e8c..d4235dc 100644
+index 1d274ed..4d67009 100644
--- a/node_modules/element-plus/es/components/tooltip/src/content2.mjs
+++ b/node_modules/element-plus/es/components/tooltip/src/content2.mjs
-@@ -66,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
+@@ -72,7 +72,7 @@ const _sfc_main = defineComponent({
const ariaHidden = ref(true);
const onTransitionLeave = () => {
onHide();
@@ -11,12 +11,12 @@ index 00f7e8c..d4235dc 100644
ariaHidden.value = true;
};
const stopWhenControlled = () => {
-@@ -103,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
+@@ -109,7 +109,7 @@ const _sfc_main = defineComponent({
var _a;
const popperContent = (_a = contentRef.value) == null ? void 0 : _a.popperContentRef;
const activeElement = (event == null ? void 0 : event.relatedTarget) || document.activeElement;
- return popperContent == null ? void 0 : popperContent.contains(activeElement);
+ return popperContent && ((activeElement.shadowRoot || activeElement).contains(popperContent) || popperContent.contains(activeElement));
};
- watch(() => unref(open), (val) => {
- if (!val) {
+ watch(
+ () => unref(open),
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/dfead3991fec2ede8ea7db4dec32c63a77fc4a46...5923978137b1d523d01716a42f20352471e54d7b
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/compare/dfead3991fec2ede8ea7db4dec32c63a77fc4a46...5923978137b1d523d01716a42f20352471e54d7b
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs