From f3e0f866412ac7c4d04afef9cadd9b6433e32602 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Wed, 23 Nov 2022 11:48:08 +0100 Subject: [PATCH] Simplify the `getFilenameFromUrl` helper function --- src/display/display_utils.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/display/display_utils.js b/src/display/display_utils.js index f904b122d..f6d245741 100644 --- a/src/display/display_utils.js +++ b/src/display/display_utils.js @@ -338,13 +338,10 @@ function isPdfFile(filename) { * @returns {string} */ function getFilenameFromUrl(url, onlyStripPath = false) { - let end = url.length; if (!onlyStripPath) { - const anchor = url.indexOf("#"); - const query = url.indexOf("?"); - end = Math.min(anchor > 0 ? anchor : end, query > 0 ? query : end); + [url] = url.split(/[#?]/, 1); } - return url.substring(url.lastIndexOf("/", end) + 1, end); + return url.substring(url.lastIndexOf("/") + 1); } /**