From f4f7e190d94be9464ac33237af4438da36106139 Mon Sep 17 00:00:00 2001 From: i-just Date: Fri, 22 May 2026 13:39:59 +0200 Subject: [PATCH] update the transform regex to account for image format transform too --- src/web/assets/ckeditor/dist/ckeditor5-craftcms.js | 4 ++-- .../assets/ckeditor/src/image/imageinsert/imageinsertui.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/web/assets/ckeditor/dist/ckeditor5-craftcms.js b/src/web/assets/ckeditor/dist/ckeditor5-craftcms.js index 6f7cbbcf..e3be9769 100644 --- a/src/web/assets/ckeditor/dist/ckeditor5-craftcms.js +++ b/src/web/assets/ckeditor/dist/ckeditor5-craftcms.js @@ -139,10 +139,10 @@ class Xu extends au { return `${w}#asset:${E}:${T ? "transform:" + T : "url"}`; } _removeTransformFromUrl(E) { - return E.replace(/(^|\/)(_[^\/]+\/)([^\/]+)$/, "$1$3"); + return E.replace(/(^|\/)_[^\/]+(\/\d+)?\/([^\/]+)$/, "$1$3"); } _isTransformUrl(E) { - return /(^|\/)_[^\/]+\/[^\/]+$/.test(E); + return /(^|\/)_[^\/]+(\/\d+)?(\/[^\/]+)$/.test(E); } async _getTransformUrl(E, w) { let T; diff --git a/src/web/assets/ckeditor/src/image/imageinsert/imageinsertui.js b/src/web/assets/ckeditor/src/image/imageinsert/imageinsertui.js index 0ec40e14..f1a8a207 100644 --- a/src/web/assets/ckeditor/src/image/imageinsert/imageinsertui.js +++ b/src/web/assets/ckeditor/src/image/imageinsert/imageinsertui.js @@ -210,11 +210,11 @@ export default class CraftImageInsertUI extends ImageInsertUI { } _removeTransformFromUrl(url) { - return url.replace(/(^|\/)(_[^\/]+\/)([^\/]+)$/, '$1$3'); + return url.replace(/(^|\/)_[^\/]+(\/\d+)?\/([^\/]+)$/, '$1$3'); } _isTransformUrl(url) { - return /(^|\/)_[^\/]+\/[^\/]+$/.test(url); + return /(^|\/)_[^\/]+(\/\d+)?(\/[^\/]+)$/.test(url); } async _getTransformUrl(assetId, handle) {