Skip image uploading from same domain, check DOM before insert #53

mcguffin · Oct 27, 2023 · 462ee53 · 462ee53
1 parent 20a9118
commit 462ee53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/js/admin/mce/the-paste-plugin/index.js b/src/js/admin/mce/the-paste-plugin/index.js
@@ -69,7 +69,7 @@ class PasteOperation {
 				div.innerHTML = html
 				images.push( ...Array.from(div.querySelectorAll('img')) )
 
-				Array.from(div.childNodes).forEach( node => placeholder.parentNode.insertBefore( node, placeholder ) )
+				Array.from(div.childNodes).forEach( node => placeholder?.parentNode?.insertBefore( node, placeholder ) )
 				placeholder?.remove()
 
 				if ( images.length ) {
@@ -237,7 +237,7 @@ tinymce.PluginManager.add( 'the_paste', editor => {
 			})
 		})
 		.on( 'Paste', e => {
-			if ( !!pasteOnOffBtn && ! pasteOnOffBtn.active() ) {
+			if ( !!pasteOnOffBtn && ! pasteOnOffBtn.active() || document.body.matches('.modal-open') ) {
 				return;
 			}
 			const pasteOperation = PasteOperation.init(e) //.dumpClipboardData()

diff --git a/src/js/lib/converter.js b/src/js/lib/converter.js
@@ -17,10 +17,18 @@ const itemHandler = type => {
 			return []
 		},
 		'text/html': async item => {
+			const loc = new URL( document.location )
 			const div = document.createElement('div')
 			div.innerHTML = await Converter.itemToString( item )
 
-			const imgs = Array.from( div.querySelectorAll('img') ).map( img => Converter.elementToFile(img) )
+			const imgs = Array.from( div.querySelectorAll('img') )
+				.filter( img => {
+					// remove images from same domain
+					const u = new URL(img.src)
+					return ! ['http:','https:'].includes(u.protocol) || loc.hostname !== u.hostname
+				} )
+				.map( img => Converter.elementToFile(img) )
+
 			return new Promise( (resolve,reject) => {
 				Promise.allSettled( imgs ).then( result => resolve( Array.from(result).map( promise => promise.value )) )
 			})