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

Ignore bogus small height values from twitframe.com, and make iframe resizable. #1517

Browse Source
This commit is contained in:
ccd0 2017-10-02 02:23:30 -07:00
parent 83e1b610ad
commit f19a662c8d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Linkification/Embedding.coffee
View File

@ -400,7 +400,7 @@ Embedding =
, ,
key: 'Twitter' key: 'Twitter'
regExp: /^\w+:\/\/(?:www\.|mobile\.)?twitter\.com\/(\w+\/status\/\d+)/ regExp: /^\w+:\/\/(?:www\.|mobile\.)?twitter\.com\/(\w+\/status\/\d+)/
style: 'border: none; width: 550px; height: 250px; max-height: 80vh;' style: 'border: none; width: 550px; height: 250px; overflow: hidden; resize: both;'
el: (a) -> el: (a) ->
el = $.el 'iframe' el = $.el 'iframe'
$.on el, 'load', -> $.on el, 'load', ->
@ -408,10 +408,17 @@ Embedding =
onMessage = (e) -> onMessage = (e) ->
if e.source is el.contentWindow and e.origin is 'https://twitframe.com' if e.source is el.contentWindow and e.origin is 'https://twitframe.com'
$.off window, 'message', onMessage $.off window, 'message', onMessage
el.style.height = "#{+e.data.height}px" (cont or el).style.height = "#{+$.minmax(e.data.height, 250, 0.8 * doc.clientHeight)}px"
$.on window, 'message', onMessage $.on window, 'message', onMessage
el.src = "https://twitframe.com/show?url=https://twitter.com/#{a.dataset.uid}" el.src = "https://twitframe.com/show?url=https://twitter.com/#{a.dataset.uid}"
el if $.engine is 'gecko'
# XXX https://bugzilla.mozilla.org/show_bug.cgi?id=680823
el.style.cssText = 'border: none; width: 100%; height: 100%;'
cont = $.el 'div'
$.add cont, el
cont
else
el
, ,
key: 'Vimeo' key: 'Vimeo'
regExp: /^\w+:\/\/(?:www\.)?vimeo\.com\/(\d+)/ regExp: /^\w+:\/\/(?:www\.)?vimeo\.com\/(\d+)/