fix

Author: wxiaoguang

web_src/js/features/comp/EditorUpload.js

@@ -5,7 +5,6 @@ import {replaceTextareaSelection} from '../../utils/dom.js';
 import {isUrl} from '../../utils/url.js';
 import {extname} from '../../utils.js';
 import {triggerEditorContentChanged} from './EditorMarkdown.js';
-import {getComboMarkdownEditor} from './ComboMarkdownEditor.js';
 
 async function uploadFile(file, uploadUrl) {
   const formData = new FormData();
@@ -174,7 +173,7 @@ export function initTextareaPaste(textarea, dropzone) {
     }
   });
   textarea.addEventListener('drop', (e) => {
-    const acceptedFiles = getComboMarkdownEditor(textarea).dropzone.getAttribute('data-accepts');
+    const acceptedFiles = dropzone.getAttribute('data-accepts');
     const files = [];
     for (const item of e.dataTransfer?.items ?? []) {
       if (item?.kind !== 'file') continue;

web_src/js/features/dropzone.js

@@ -78,6 +78,9 @@ export async function initDropzone(dropzoneEl) {
 
   dzInst.on('removedfile', async (file) => {
     if (disableRemovedfileEvent) return;
+
+    // TODO: remove the link from editor
+
     document.querySelector(`#dropzone-file-${file.uuid}`)?.remove();
     // when the uploaded file number reaches the limit, there is no uuid in the dict, and it doesn't need to be removed from server
     if (removeAttachmentUrl && fileUuidDict[file.uuid] && !fileUuidDict[file.uuid].submitted) {

web_src/js/utils.js

@@ -8,7 +8,9 @@ export function basename(path = '') {
 
 // transform /path/to/file.ext to .ext
 export function extname(path = '') {
+  const lastSlashIndex = path.lastIndexOf('/');
   const lastPointIndex = path.lastIndexOf('.');
+  if (lastSlashIndex > lastPointIndex) return '';
   return lastPointIndex < 0 ? '' : path.substring(lastPointIndex);
 }
 
@@ -142,3 +144,7 @@ export function serializeXml(node) {
 }
 
 export const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export function isWellKnownImageFilename(fn) {
+  return /\.(jpe?g|png|gif|webp|svg)$/i.test(fn);
+}

web_src/js/utils.test.js

@@ -1,7 +1,7 @@
 import {
   basename, extname, isObject, stripTags, parseIssueHref,
   parseUrl, translateMonth, translateDay, blobToDataURI,
-  toAbsoluteUrl, encodeURLEncodedBase64, decodeURLEncodedBase64,
+  toAbsoluteUrl, encodeURLEncodedBase64, decodeURLEncodedBase64, isWellKnownImageFilename,
 } from './utils.js';
 
 test('basename', () => {
@@ -15,6 +15,7 @@ test('extname', () => {
   expect(extname('/path/')).toEqual('');
   expect(extname('/path')).toEqual('');
   expect(extname('file.js')).toEqual('.js');
+  expect(extname('/my.path/file')).toEqual('');
 });
 
 test('isObject', () => {
@@ -112,3 +113,12 @@ test('encodeURLEncodedBase64, decodeURLEncodedBase64', () => {
   expect(Array.from(decodeURLEncodedBase64('YQ'))).toEqual(Array.from(uint8array('a')));
   expect(Array.from(decodeURLEncodedBase64('YQ=='))).toEqual(Array.from(uint8array('a')));
 });
+
+test('isWellKnownImageFilename', () => {
+  for (const filename of ['a.jpg', '/a.jpeg', '.file.png', '.webp', 'file.svg']) {
+    expect(isWellKnownImageFilename(filename)).toBeTruthy();
+  }
+  for (const filename of ['', 'a.jpg.x', '/path.png/x', 'webp']) {
+    expect(isWellKnownImageFilename(filename)).toBeFalsy();
+  }
+});

web_src/js/utils/dom.js

@@ -1,5 +1,4 @@
 import {debounce} from 'throttle-debounce';
-import {extname} from '../utils.js';
 
 function elementsCall(el, func, ...args) {
   if (typeof el === 'string' || el instanceof String) {