From 36213f5621a141def1751442f7591009bb41bfbb Mon Sep 17 00:00:00 2001 From: Isaiah Odhner Date: Fri, 18 Dec 2020 14:05:49 -0500 Subject: [PATCH] Match file extensions case-insensitively --- index.html | 4 ++-- src/$ToolBox.js | 2 +- src/functions.js | 12 ++++++------ src/tool-options.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 411a1e0..457373d 100644 --- a/index.html +++ b/index.html @@ -534,11 +534,11 @@ let href = stylesheet.getAttribute("href"); if (get_direction(language) === "rtl") { if (href.indexOf(".rtl.css") === -1) { - href = href.replace(/\.css/, ".rtl.css"); + href = href.replace(/\.css/i, ".rtl.css"); } } else { if (href.indexOf(".rtl.css") > -1) { - href = href.replace(/\.rtl\.css/, ".css"); + href = href.replace(/\.rtl\.css/i, ".css"); } } stylesheet.setAttribute("href", href); diff --git a/src/$ToolBox.js b/src/$ToolBox.js index 3c92fb2..912fd16 100644 --- a/src/$ToolBox.js +++ b/src/$ToolBox.js @@ -20,7 +20,7 @@ function $ToolBox(tools, is_extras){ const $icon = $(E("span")); $icon.appendTo($b); const update_css = ()=> { - const theme_folder = `images/${get_theme().replace(/\.css/, "")}`; + const theme_folder = `images/${get_theme().replace(/\.css/i, "")}`; const theme_has_svg = get_theme().match(/classic.css|dark.css/); const use_svg = !theme_dev_blob_url && ( (theme_has_svg && diff --git a/src/functions.js b/src/functions.js index e8c173c..7b3e440 100644 --- a/src/functions.js +++ b/src/functions.js @@ -763,9 +763,9 @@ function file_load_from_url(){ function file_save(){ deselect(); - if(file_name.match(/\.svg$/)){ + if(file_name.match(/\.svg$/i)){ // @TODO: only affect suggested name in save dialog, don't change file_name - file_name = `${file_name.replace(/\.svg$/, "")}.png`; + file_name = `${file_name.replace(/\.svg$/i, "")}.png`; return file_save_as(); } if(document_file_path){ @@ -782,7 +782,7 @@ function file_save(){ function file_save_as(){ deselect(); - save_canvas_as(canvas, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/, "")}.png`, (saved_file_path, saved_file_name) => { + save_canvas_as(canvas, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/i, "")}.png`, (saved_file_path, saved_file_name) => { saved = true; document_file_path = saved_file_path; file_name = saved_file_name; @@ -1176,7 +1176,7 @@ function render_history_as_gif(){ $win.$Button(localize("Save"), () => { $win.close(); sanity_check_blob(blob, () => { - saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/, "")} history.gif`); + saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/i, "")} history.gif`); }); }); $cancel.appendTo($win.$buttons); @@ -2315,7 +2315,7 @@ function save_canvas_as(canvas, fileName, savedCallbackUnreliable){ // @TODO: file name + type dialog canvas.toBlob(blob => { sanity_check_blob(blob, () => { - const file_saver = saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/, "")}.png`); + const file_saver = saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/i, "")}.png`); file_saver.onwriteend = () => { // this won't fire in chrome savedCallbackUnreliable(); @@ -2346,7 +2346,7 @@ function set_as_wallpaper_centered(c = canvas) { c.toBlob(blob => { sanity_check_blob(blob, () => { - saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/, "")} wallpaper.png`); + saveAs(blob, `${file_name.replace(/\.(bmp|dib|a?png|gif|jpe?g|jpe|jfif|tiff?|webp|raw)$/i, "")} wallpaper.png`); }); }); } diff --git a/src/tool-options.js b/src/tool-options.js index 7c4de90..703bb59 100644 --- a/src/tool-options.js +++ b/src/tool-options.js @@ -303,7 +303,7 @@ const $choose_transparent_mode = $Choose( (option, _is_chosen, reuse_canvas) => { const sw = 35, sh = 23; // width, height from source image const b = 2; // margin by which the source image is inset on the destination - const theme_folder = `images/${get_theme().replace(/\.css/, "")}`; + const theme_folder = `images/${get_theme().replace(/\.css/i, "")}`; return ChooserCanvas( `${theme_folder}/options-transparency.png`, false, // never invert it