Merge branch 'master' of github.com:zixaphir/appchan-x

This commit is contained in:
Zixaphir 2013-12-06 17:29:56 -07:00
commit b5f12847d0

View File

@ -288,8 +288,13 @@ Linkify =
LiveLeak:
regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/
el: (a) ->
$.el 'object',
innerHTML: "<embed src='http://www.liveleak.com/e/#{a.dataset.uid}?autostart=true' wmode='opaque' width='640' height='390' pluginspage='http://get.adobe.com/flashplayer/' type='application/x-shockwave-flash'></embed>"
ret = $.el 'iframe',
width: "640",
height: "360",
src: "http://www.liveleak.com/ll_embed?i=#{a.dataset.uid}",
frameborder: "0"
ret.setAttribute "allowfullscreen", "true"
ret
MediaCrush:
regExp: /.*(?:mediacru.sh\/)([0-9a-z_]+)/i