wait #5163 @1.5

diff --git a/composer.json b/composer.json
index df623fe6d7f7330689684a38e75130fcd7ebf29f..c120c49f0202c421e1f9326e6cab8592298b57be 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,12 @@
         "cubist/minisearch": "dev-master",
         "cubist/socialite": "dev-master",
         "fluidbook/tools": "dev-master",
-        "fruitcake/laravel-cors": "^2.0",
+        "fruitcake/laravel-cors": "^2.2",
         "guzzlehttp/guzzle": "^7.4",
-        "laravel/framework": "^v8.80",
+        "laravel/framework": "^v8.83",
         "laravel/sanctum": "^v2.14",
         "laravel/tinker": "^v2.7",
-        "mxl/laravel-job": "^v1.2",
+        "mxl/laravel-job": "^v1.3",
         "php-ffmpeg/php-ffmpeg": "^v0.19.0",
         "spatie/laravel-permission": "^4.4"
     },

diff --git a/resources/pdfjs/build/pdf.js b/resources/pdfjs/build/pdf.js
index fde8904fcaf207739b517c5ff2ec286b50862314..e7a603123522d11cdc41ff85f775d0b51be51386 100644 (file)
--- a/resources/pdfjs/build/pdf.js
+++ b/resources/pdfjs/build/pdf.js
@@ -973,6 +973,8 @@ function _isValidProtocol(url) {
     case "ftp:":
     case "mailto:":
     case "tel:":
+    case "pdf:":
+    case "tooltip:":
       return true;
 
     default:
@@ -14541,7 +14543,7 @@ class PDFFetchStreamRangeReader {
 /************************************************************************/
 /******/       // The module cache
 /******/       var __webpack_module_cache__ = {};
-/******/       
+/******/
 /******/       // The require function
 /******/       function __w_pdfjs_require__(moduleId) {
 /******/               // Check if module is in cache
@@ -14555,14 +14557,14 @@ class PDFFetchStreamRangeReader {
 /******/                       // no module.loaded needed
 /******/                       exports: {}
 /******/               };
-/******/       
+/******/
 /******/               // Execute the module function
 /******/               __webpack_modules__[moduleId](module, module.exports, __w_pdfjs_require__);
-/******/       
+/******/
 /******/               // Return the exports of the module
 /******/               return module.exports;
 /******/       }
-/******/       
+/******/
 /************************************************************************/
 var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
@@ -14837,4 +14839,4 @@ const pdfjsBuild = '156762c48';
 /******/ })()
 ;
 });
-//# sourceMappingURL=pdf.js.map
\ No newline at end of file
+//# sourceMappingURL=pdf.js.map

diff --git a/resources/pdfjs/build/pdf.worker.js b/resources/pdfjs/build/pdf.worker.js
index 3328982aac2815b6edae3492b18f4c68a6261fc5..e317b3d71f21a8f390de6127f72b68db9984b182 100644 (file)
--- a/resources/pdfjs/build/pdf.worker.js
+++ b/resources/pdfjs/build/pdf.worker.js
@@ -1148,6 +1148,7 @@
                         case "mailto:":
                         case "tel:":
                         case "pdf:":
+                        case "tooltip:":
                             return true;
 
                         default:

diff --git a/resources/pdfjs/web/viewer.html b/resources/pdfjs/web/viewer.html
index e987d4e4bad0c5a7627fc968a91fcd5e263d217d..92bc0c62a45d22543a8ddb7ea068b3e793152169 100644 (file)
--- a/resources/pdfjs/web/viewer.html
+++ b/resources/pdfjs/web/viewer.html
@@ -32,6 +32,15 @@ See https://github.com/adobe-type-tools/cmap-resources
     <script>
         var inFluidbook = window.parent.fluidbook !== undefined;
         $(function () {
+            $(document).on('click', 'a[href^="tooltip:"]', function () {
+                return false;
+            });
+
+            $(document).on('mouseover', 'a[href^="tooltip:"]', function () {
+                $(this).attr('title', $(this).attr('href').substring(8));
+                return true;
+            });
+
             $(document).on('click', 'a[href^="pdf:"]', function () {
                 var e = $(this).attr('href').split('#');
                 var file;
@@ -50,9 +59,9 @@ See https://github.com/adobe-type-tools/cmap-resources
                         hash = '#page=' + e[1];
                     }
                 }
-                if(inFluidbook) {
+                if (inFluidbook) {
                     window.location = 'viewer.html?file=../../data/links/' + file + hash;
-                }else{
+                } else {
                     window.location = 'viewer.html?file=' + file + hash;
                 }
                 return false;