Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for changes in Tegaki (4chan drawing script). #2467

Browse Source
This commit is contained in:
ccd0 2019-12-12 22:57:29 -08:00
parent 08c967ece5
commit 905e619629
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Posting/QR.coffee
View File

@ -364,6 +364,7 @@ QR =
$.on el, (if isVideo then 'loadeddata' else 'load'), -> $.on el, (if isVideo then 'loadeddata' else 'load'), ->
e.target.getContext('2d').drawImage el, 0, 0 e.target.getContext('2d').drawImage el, 0, 0
URL.revokeObjectURL el.src URL.revokeObjectURL el.src
$.event 'QRImageDrawn', null, e.target
el.src = URL.createObjectURL file el.src = URL.createObjectURL file
openError: -> openError: ->

17
src/Posting/QR.oekaki.coffee
View File

@ -60,14 +60,14 @@ QR.oekaki =
document.querySelector('#qr .oekaki').hidden = false document.querySelector('#qr .oekaki').hidden = false
load: (cb) -> load: (cb) ->
if $ 'script[src^="//s.4cdn.org/js/painter"]', d.head if $ 'script[src^="//s.4cdn.org/js/tegaki"]', d.head
cb() cb()
else else
style = $.el 'link', style = $.el 'link',
rel: 'stylesheet' rel: 'stylesheet'
href: "//s.4cdn.org/css/painter.#{Date.now()}.css" href: "//s.4cdn.org/css/tegaki.#{Date.now()}.css"
script = $.el 'script', script = $.el 'script',
src: "//s.4cdn.org/js/painter.min.#{Date.now()}.js" src: "//s.4cdn.org/js/tegaki.min.#{Date.now()}.js"
n = 0 n = 0
onload = -> onload = ->
cb() if ++n is 2 cb() if ++n is 2
@ -124,7 +124,16 @@ QR.oekaki =
width: +selected.dataset.width width: +selected.dataset.width
height: +selected.dataset.height height: +selected.dataset.height
bgColor: 'transparent' bgColor: 'transparent'
Tegaki.activeCtx.canvas.dispatchEvent new CustomEvent 'QRDrawFile', {bubbles: true} canvas = document.createElement 'canvas'
canvas.width = canvas.naturalWidth = +selected.dataset.width
canvas.height = canvas.naturalHeight = +selected.dataset.height
canvas.hidden = true
document.body.appendChild canvas
canvas.addEventListener 'QRImageDrawn', ->
@remove()
Tegaki.onOpenImageLoaded.call @
, false
canvas.dispatchEvent new CustomEvent 'QRDrawFile', {bubbles: true}
if Tegaki.bg and Tegaki.onDoneCb is FCX.oekakiCB and source is FCX.oekakiLatest if Tegaki.bg and Tegaki.onDoneCb is FCX.oekakiCB and source is FCX.oekakiLatest
FCX.oekakiName = name FCX.oekakiName = name
Tegaki.resume() Tegaki.resume()