Lib / JQuery update / Webcomponent compatibility.

fxprunayre · May 17, 2024 · 48f0b6f · 48f0b6f
1 parent e2635ab
commit 48f0b6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml b/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml
@@ -34,7 +34,7 @@
   </require>
   <declarative name="lib" pathOnDisk="web-ui/src/main/resources">
     <jsSource webappPath="/catalog/lib/modernizr.js" minimize="false"/>
-    <jsSource webappPath="/catalog/lib/jquery-3.7.1.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-3.7.1.js" minimize="true"/>
     <jsSource webappPath="/catalog/lib/jquery-migrate-mute.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/jquery-migrate-3.4.1.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-with-locales.min.js" minimize="false"/>
@@ -80,13 +80,13 @@
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/tagsinput/bootstrap-tagsinput-angular.js"/>
-    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.js" minimize="true"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.fr.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap.ext/datepicker/bootstrap-datepicker.nl.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table.min.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table/dist/bootstrap-table-locale-all.min.js"
-            minimize="false"/>
+              minimize="false"/>
     <jsSource webappPath="/catalog/lib/bootstrap-table-angular.js"
               minimize="false"/>
     <jsSource webappPath="/catalog/lib/FileSaver/FileSaver.min.js" minimize="false"/>
@@ -105,7 +105,7 @@
   <!-- Same as previous + olcesium -->
   <declarative name="lib3d" pathOnDisk="web-ui/src/main/resources">
     <jsSource webappPath="/catalog/lib/modernizr.js" minimize="false"/>
-    <jsSource webappPath="/catalog/lib/jquery-3.7.1.min.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/jquery-3.7.1.js" minimize="true"/>
     <jsSource webappPath="/catalog/lib/jquery-migrate-mute.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/jquery-migrate-3.4.1.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/moment-with-locales.min.js" minimize="false"/>

diff --git a/web-ui/src/main/resources/catalog/lib/jquery-3.7.1.js b/web-ui/src/main/resources/catalog/lib/jquery-3.7.1.js
@@ -153,7 +153,9 @@
 
     // Define a local copy of jQuery
     jQuery = function( selector, context ) {
-
+      if (context == undefined && typeof gnShadowRoot !== 'undefined') {
+        context = gnShadowRoot;
+      }
       // The jQuery object is actually just the init constructor 'enhanced'
       // Need init if jQuery is called (just allow error to be thrown if not included)
       return new jQuery.fn.init( selector, context );
@@ -3961,7 +3963,9 @@
     //    - Node.DOCUMENT_NODE
     //  - Object
     //    - Any
-    return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
+    // https://github.com/jquery/jquery/issues/4317
+    return owner.nodeType === 1 || owner.nodeType === 9 || (owner.nodeType === 11 && owner.host) || !( +owner.nodeType );
+    // return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
   };