@@ -327,11 +327,11 @@ function getPastedImages(e) {
327327 return files ;
328328}
329329
330- async function uploadFile ( file ) {
330+ async function uploadFile ( file , uploadUrl ) {
331331 const formData = new FormData ( ) ;
332332 formData . append ( 'file' , file , file . name ) ;
333333
334- const res = await fetch ( $ ( '#dropzone' ) . data ( 'upload-url' ) , {
334+ const res = await fetch ( uploadUrl , {
335335 method : 'POST' ,
336336 headers : { 'X-Csrf-Token' : csrf } ,
337337 body : formData ,
@@ -345,24 +345,33 @@ function reload() {
345345
346346function initImagePaste ( target ) {
347347 target . each ( function ( ) {
348- this . addEventListener ( 'paste' , async ( e ) => {
349- for ( const img of getPastedImages ( e ) ) {
350- const name = img . name . substr ( 0 , img . name . lastIndexOf ( '.' ) ) ;
351- insertAtCursor ( this , `![${ name } ) ;
352- const data = await uploadFile ( img ) ;
353- replaceAndKeepCursor ( this , `![${ name } , `![${ name } ${ AppSubUrl } ${ data . uuid } ) ;
354- const input = $ ( `<input id="${ data . uuid } ) . val ( data . uuid ) ;
355- $ ( '.files' ) . append ( input ) ;
356- }
357- } , false ) ;
348+ const dropzone = this . querySelector ( '.dropzone' ) ;
349+ if ( ! dropzone ) {
350+ return ;
351+ }
352+ const uploadUrl = dropzone . dataset . uploadUrl ;
353+ const dropzoneFiles = dropzone . querySelector ( '.files' ) ;
354+ for ( const textarea of this . querySelectorAll ( 'textarea' ) ) {
355+ textarea . addEventListener ( 'paste' , async ( e ) => {
356+ for ( const img of getPastedImages ( e ) ) {
357+ const name = img . name . substr ( 0 , img . name . lastIndexOf ( '.' ) ) ;
358+ insertAtCursor ( textarea , `![${ name } ) ;
359+ const data = await uploadFile ( img , uploadUrl ) ;
360+ replaceAndKeepCursor ( textarea , `![${ name } , `![${ name } ${ AppSubUrl } ${ data . uuid } ) ;
361+ const input = $ ( `<input id="${ data . uuid } ) . val ( data . uuid ) ;
362+ dropzoneFiles . appendChild ( input [ 0 ] ) ;
363+ }
364+ } , false ) ;
365+ }
358366 } ) ;
359367}
360368
361- function initSimpleMDEImagePaste ( simplemde , files ) {
369+ function initSimpleMDEImagePaste ( simplemde , dropzone , files ) {
370+ const uploadUrl = dropzone . dataset . uploadUrl ;
362371 simplemde . codemirror . on ( 'paste' , async ( _ , e ) => {
363372 for ( const img of getPastedImages ( e ) ) {
364373 const name = img . name . substr ( 0 , img . name . lastIndexOf ( '.' ) ) ;
365- const data = await uploadFile ( img ) ;
374+ const data = await uploadFile ( img , uploadUrl ) ;
366375 const pos = simplemde . codemirror . getCursor ( ) ;
367376 simplemde . codemirror . replaceRange ( `![${ name } ${ AppSubUrl } ${ data . uuid } , pos ) ;
368377 const input = $ ( `<input id="${ data . uuid } ) . val ( data . uuid ) ;
@@ -381,7 +390,7 @@ function initCommentForm() {
381390 autoSimpleMDE = setCommentSimpleMDE ( $ ( '.comment.form textarea:not(.review-textarea)' ) ) ;
382391 initBranchSelector ( ) ;
383392 initCommentPreviewTab ( $ ( '.comment.form' ) ) ;
384- initImagePaste ( $ ( '.comment.form textarea ' ) ) ;
393+ initImagePaste ( $ ( '.comment.form' ) ) ;
385394
386395 // Listsubmit
387396 function initListSubmits ( selector , outerSelector ) {
@@ -993,8 +1002,7 @@ async function initRepository() {
9931002
9941003 let dz ;
9951004 const $dropzone = $editContentZone . find ( '.dropzone' ) ;
996- const $files = $editContentZone . find ( '.comment-files' ) ;
997- if ( $dropzone . length > 0 ) {
1005+ if ( $dropzone . length === 1 ) {
9981006 $dropzone . data ( 'saved' , false ) ;
9991007
10001008 const filenameDict = { } ;
@@ -1020,7 +1028,7 @@ async function initRepository() {
10201028 submitted : false
10211029 } ;
10221030 const input = $ ( `<input id="${ data . uuid } ) . val ( data . uuid ) ;
1023- $files . append ( input ) ;
1031+ $dropzone . find ( '. files' ) . append ( input ) ;
10241032 } ) ;
10251033 this . on ( 'removedfile' , ( file ) => {
10261034 if ( ! ( file . name in filenameDict ) ) {
@@ -1042,7 +1050,7 @@ async function initRepository() {
10421050 this . on ( 'reload' , ( ) => {
10431051 $ . getJSON ( $editContentZone . data ( 'attachment-url' ) , ( data ) => {
10441052 dz . removeAllFiles ( true ) ;
1045- $files . empty ( ) ;
1053+ $dropzone . find ( '. files' ) . empty ( ) ;
10461054 $ . each ( data , function ( ) {
10471055 const imgSrc = `${ $dropzone . data ( 'link-url' ) } ${ this . uuid } ;
10481056 dz . emit ( 'addedfile' , this ) ;
@@ -1055,7 +1063,7 @@ async function initRepository() {
10551063 } ;
10561064 $dropzone . find ( `img[src='${ imgSrc } ) . css ( 'max-width' , '100%' ) ;
10571065 const input = $ ( `<input id="${ this . uuid } ) . val ( this . uuid ) ;
1058- $files . append ( input ) ;
1066+ $dropzone . find ( '. files' ) . append ( input ) ;
10591067 } ) ;
10601068 } ) ;
10611069 } ) ;
@@ -1075,7 +1083,9 @@ async function initRepository() {
10751083 $simplemde = setCommentSimpleMDE ( $textarea ) ;
10761084 commentMDEditors [ $editContentZone . data ( 'write' ) ] = $simplemde ;
10771085 initCommentPreviewTab ( $editContentForm ) ;
1078- initSimpleMDEImagePaste ( $simplemde , $files ) ;
1086+ if ( $dropzone . length === 1 ) {
1087+ initSimpleMDEImagePaste ( $simplemde , $dropzone [ 0 ] , $dropzone . find ( '.files' ) ) ;
1088+ }
10791089
10801090 $editContentZone . find ( '.cancel.button' ) . on ( 'click' , ( ) => {
10811091 $renderContent . show ( ) ;
@@ -1087,7 +1097,7 @@ async function initRepository() {
10871097 $editContentZone . find ( '.save.button' ) . on ( 'click' , ( ) => {
10881098 $renderContent . show ( ) ;
10891099 $editContentZone . hide ( ) ;
1090- const $attachments = $files . find ( '[name=files]' ) . map ( function ( ) {
1100+ const $attachments = $dropzone . find ( '. files' ) . find ( '[name=files]' ) . map ( function ( ) {
10911101 return $ ( this ) . val ( ) ;
10921102 } ) . get ( ) ;
10931103 $ . post ( $editContentZone . data ( 'update-url' ) , {
@@ -1369,6 +1379,13 @@ function initPullRequestReview() {
13691379 $simplemde . codemirror . focus ( ) ;
13701380 assingMenuAttributes ( form . find ( '.menu' ) ) ;
13711381 } ) ;
1382+
1383+ const $reviewBox = $ ( '.review-box' ) ;
1384+ if ( $reviewBox . length === 1 ) {
1385+ setCommentSimpleMDE ( $reviewBox . find ( 'textarea' ) ) ;
1386+ initImagePaste ( $reviewBox ) ;
1387+ }
1388+
13721389 // The following part is only for diff views
13731390 if ( $ ( '.repository.pull.diff' ) . length === 0 ) {
13741391 return ;
@@ -1656,6 +1673,10 @@ $.fn.getCursorPosition = function () {
16561673} ;
16571674
16581675function setCommentSimpleMDE ( $editArea ) {
1676+ if ( $editArea . length === 0 ) {
1677+ return null ;
1678+ }
1679+
16591680 const simplemde = new SimpleMDE ( {
16601681 autoDownloadFontAwesome : false ,
16611682 element : $editArea [ 0 ] ,
@@ -1827,7 +1848,8 @@ function initReleaseEditor() {
18271848 const $files = $editor . parent ( ) . find ( '.files' ) ;
18281849 const $simplemde = setCommentSimpleMDE ( $textarea ) ;
18291850 initCommentPreviewTab ( $editor ) ;
1830- initSimpleMDEImagePaste ( $simplemde , $files ) ;
1851+ const dropzone = $editor . parent ( ) . find ( '.dropzone' ) [ 0 ] ;
1852+ initSimpleMDEImagePaste ( $simplemde , dropzone , $files ) ;
18311853}
18321854
18331855function initOrganization ( ) {
@@ -2610,11 +2632,10 @@ $(document).ready(async () => {
26102632 initLinkAccountView ( ) ;
26112633
26122634 // Dropzone
2613- const $dropzone = $ ( '#dropzone' ) ;
2614- if ( $dropzone . length > 0 ) {
2635+ for ( const el of document . querySelectorAll ( '.dropzone' ) ) {
26152636 const filenameDict = { } ;
2616-
2617- await createDropzone ( '#dropzone' , {
2637+ const $dropzone = $ ( el ) ;
2638+ await createDropzone ( el , {
26182639 url : $dropzone . data ( 'upload-url' ) ,
26192640 headers : { 'X-Csrf-Token' : csrf } ,
26202641 maxFiles : $dropzone . data ( 'max-file' ) ,
@@ -2633,7 +2654,7 @@ $(document).ready(async () => {
26332654 this . on ( 'success' , ( file , data ) => {
26342655 filenameDict [ file . name ] = data . uuid ;
26352656 const input = $ ( `<input id="${ data . uuid } ) . val ( data . uuid ) ;
2636- $ ( '.files' ) . append ( input ) ;
2657+ $dropzone . find ( '.files' ) . append ( input ) ;
26372658 } ) ;
26382659 this . on ( 'removedfile' , ( file ) => {
26392660 if ( file . name in filenameDict ) {
0 commit comments