Skip to content

Commit

Permalink
Include CSRF token in uploads to richeditor
Browse files Browse the repository at this point in the history
  • Loading branch information
daftspunk committed Apr 30, 2019
1 parent 7a4052b commit 3e5449c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ froalaOptions.lineBreakerTags=this.options.lineBreakerTags?this.options.lineBrea
froalaOptions.shortcutsEnabled=['show','bold','italic','underline','indent','outdent','undo','redo']
froalaOptions.imageUploadURL=froalaOptions.fileUploadURL=window.location
froalaOptions.imageUploadParam=froalaOptions.fileUploadParam='file_data'
froalaOptions.imageUploadParams=froalaOptions.fileUploadParams={X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD:1}
froalaOptions.imageUploadParams=froalaOptions.fileUploadParams={X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD:1,_token:$('meta[name="csrf-token"]').attr('content')}
var placeholder=this.$textarea.attr('placeholder')
froalaOptions.placeholderText=placeholder?placeholder:''
froalaOptions.height=this.$el.hasClass('stretch')?Infinity:$('.height-indicator',this.$el).height()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@
// File upload
froalaOptions.imageUploadURL = froalaOptions.fileUploadURL = window.location
froalaOptions.imageUploadParam = froalaOptions.fileUploadParam = 'file_data'
froalaOptions.imageUploadParams = froalaOptions.fileUploadParams = { X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD: 1 }
froalaOptions.imageUploadParams = froalaOptions.fileUploadParams = {
X_OCTOBER_MEDIA_MANAGER_QUICK_UPLOAD: 1,
_token: $('meta[name="csrf-token"]').attr('content')
}

var placeholder = this.$textarea.attr('placeholder')
froalaOptions.placeholderText = placeholder ? placeholder : ''
Expand Down Expand Up @@ -222,7 +225,7 @@

$(window).on('resize', this.proxy(this.updateLayout))
$(window).on('oc.updateUi', this.proxy(this.updateLayout))

// Bind the keydown listener here to ensure it gets handled before the Froala handlers
editor.events.on('keydown', this.proxy(this.onKeydown), true)

Expand Down

0 comments on commit 3e5449c

Please sign in to comment.