Bump pdfjs version; add webjars-locator-core

keeps · Jun 7, 2024 · be96efc · be96efc
1 parent e6f9c13
commit be96efc
Show file tree

Hide file tree

Showing 373 changed files with 132,246 additions and 24 deletions.
diff --git a/roda-ui/roda-wui/pom.xml b/roda-ui/roda-wui/pom.xml
@@ -542,6 +542,11 @@
             <version>0.15.4</version>
         </dependency>
         <!-- WebJars https://www.webjars.org -->
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-locator-core</artifactId>
+            <version>0.55</version>
+        </dependency>
         <!-- Global icon font -->
         <dependency>
             <groupId>org.webjars</groupId>
@@ -571,19 +576,19 @@
             <groupId>org.webjars.bower</groupId>
             <artifactId>github-com-jquery-textfill-jquery-textfill</artifactId>
             <version>0.6.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.webjars.bower</groupId>
+                    <artifactId>jquery</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Code highlight for viewer and others -->
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>highlightjs</artifactId>
             <version>11.5.0</version>
         </dependency>
-        <!-- PDF viewer -->
-        <dependency>
-            <groupId>org.webjars</groupId>
-            <artifactId>pdf-js</artifactId>
-            <version>2.13.216</version>
-        </dependency>
         <!-- Moment js -->
         <dependency>
             <groupId>org.webjars</groupId>
@@ -608,6 +613,12 @@
             <groupId>org.webjars.bower</groupId>
             <artifactId>jquery-knob</artifactId>
             <version>1.2.13</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.webjars.bower</groupId>
+                    <artifactId>jquery</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BitstreamPreview.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BitstreamPreview.java
@@ -250,7 +250,7 @@ public void onAttachOrDetach(AttachEvent event) {
 
   private void pdfPreview() {
 
-    String viewerPdf = GWT.getHostPageBaseURL() + "webjars/pdf-js/2.13.216/web/viewer.html" + "?file="
+    String viewerPdf = GWT.getHostPageBaseURL() + "pdf/web/viewer.html" + "?file="
       + encode(GWT.getHostPageBaseURL() + bitstreamDownloadUri.asString()) + "#" + viewers.getOptions();
 
     final Frame frame = new Frame(viewerPdf);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/utils/JavascriptUtils.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/utils/JavascriptUtils.java
@@ -8,7 +8,6 @@
 package org.roda.wui.client.common.utils;
 
 import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.Element;
 
 public class JavascriptUtils {

diff --git a/roda-ui/roda-wui/src/main/resources/config/roda-wui.properties b/roda-ui/roda-wui/src/main/resources/config/roda-wui.properties
@@ -2054,7 +2054,7 @@ ui.viewers.html.pronoms = fmt/471
 ui.viewers.pdf.mimetypes = application/pdf
 ui.viewers.pdf.extensions = .pdf
 # Check https://github.com/mozilla/pdf.js/wiki/Viewer-options for options after the #
-# ui.viewers.pdf.options = zoom=auto&pagemode=bookmarks
+#ui.viewers.pdf.options = zoom=page-width&pagemode=bookmarks
 
 
 # Viewer file size limit (in bytes)

diff --git a/roda-ui/roda-wui/src/main/webapp/Main.html b/roda-ui/roda-wui/src/main/webapp/Main.html
@@ -16,16 +16,16 @@
 
     <!-- FlexGrid and its compatibility to support IE8+ -->
     <link href='flexgrid/flexgrid.css' rel='stylesheet' type='text/css'/>
-    <script type="text/javascript" src="webjars/jquery/3.7.1/jquery.min.js"></script>
-    <script type="text/javascript" src="webjars/iframe-resizer/4.3.2/js/iframeResizer.min.js"></script>
+    <script type="text/javascript" src="webjars/jquery/jquery.min.js"></script>
+    <script type="text/javascript" src="webjars/iframe-resizer/js/iframeResizer.min.js"></script>
 
     <!-- Highlighter -->
-    <link rel="stylesheet" href="webjars/highlightjs/11.5.0/styles/tomorrow-night-bright.min.css"/>
-    <script type="text/javascript" src="webjars/highlightjs/11.5.0/highlight.min.js"></script>
+    <link rel="stylesheet" href="webjars/highlightjs/styles/tomorrow-night-bright.min.css" type="text/css"/>
+    <script type="text/javascript" src="webjars/highlightjs/highlight.min.js"></script>
 
     <!-- Font awesome -->
-    <link rel="stylesheet" href="webjars/font-awesome/5.15.4/css/all.css" type="text/css"/>
-    <link rel="stylesheet" href="webjars/font-awesome/5.15.4/css/v4-shims.css" type="text/css"/>
+    <link rel="stylesheet" href="webjars/font-awesome/css/all.css" type="text/css"/>
+    <link rel="stylesheet" href="webjars/font-awesome/css/v4-shims.css" type="text/css"/>
 
     <!-- Theme loading and fonts -->
     <link rel="stylesheet" href="api/v2/themes?resource-id=spinner.css"/>
@@ -40,16 +40,16 @@
             src='org.roda.wui.RodaWUI/org.roda.wui.RodaWUI.nocache.js'></script>
 
     <!-- Mini Upload Form dependencies -->
-    <script src="webjars/jquery-knob/1.2.13/dist/jquery.knob.min.js" type="text/javascript"></script>
-    <script src="webjars/jquery-ui/1.13.2/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="webjars/github-com-cuba-platform-jquery-fileupload/9.12.1/jquery-iframe-transport.min.js" type="text/javascript"></script>
-    <script src="webjars/github-com-cuba-platform-jquery-fileupload/9.12.1/jquery-fileupload.min.js" type="text/javascript"></script>
+    <script src="webjars/jquery-knob/dist/jquery.knob.min.js" type="text/javascript"></script>
+    <script src="webjars/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
+    <script src="webjars/github-com-cuba-platform-jquery-fileupload/jquery-iframe-transport.min.js" type="text/javascript"></script>
+    <script src="webjars/github-com-cuba-platform-jquery-fileupload/jquery-fileupload.min.js" type="text/javascript"></script>
 
     <!-- Text fill-->
-    <script type="text/javascript" src="webjars/github-com-jquery-textfill-jquery-textfill/0.6.0/source/jquery.textfill.min.js"></script>
+    <script type="text/javascript" src="webjars/github-com-jquery-textfill-jquery-textfill/source/jquery.textfill.min.js"></script>
 
     <!-- Sidebar sticker -->
-    <script type="text/javascript" src="webjars/sticky-kit/1.1.2/jquery.sticky-kit.min.js"></script>
+    <script type="text/javascript" src="webjars/sticky-kit/jquery.sticky-kit.min.js"></script>
 
     <!-- Register Captcha -->
     <script src='https://www.google.com/recaptcha/api.js?hl=en' type="text/javascript"></script>
@@ -61,7 +61,7 @@
     <script src="api/v2/themes?resource-id=theme.js" type="text/javascript"></script>
 
     <!-- Statistics -->
-    <script src="webjars/chart.js/2.9.4/dist/Chart.bundle.min.js" type="text/javascript"></script>
+    <script src="webjars/chart.js/dist/Chart.bundle.min.js" type="text/javascript"></script>
     <script src="webjars/file-saver/dist/FileSaver.min.js" type="text/javascript"></script>
     <script src="api/v2/themes?resource-id=js/statistics.js" type="text/javascript"></script>
 
@@ -70,10 +70,10 @@
     <script src="js/ImageViewer-1.1.3/imageviewer.min.js" type="text/javascript"></script>
 
     <!-- Moment js -->
-    <script src="webjars/momentjs/2.29.4/min/moment.min.js" type="text/javascript"></script>
+    <script src="webjars/momentjs/min/moment.min.js" type="text/javascript"></script>
 
     <!-- Showdown (Markdown to html converter) -->
-    <script src="webjars/marked/4.3.0/marked.min.js" type="text/javascript"></script>
+    <script src="webjars/marked/marked.min.js" type="text/javascript"></script>
 
 </head>
 <body id="main">