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

Merge @mahkoh's embedding fixes

Browse Source
This commit is contained in:
Zixaphir 2013-12-16 13:45:56 -07:00
parent cc5cf4f124
commit 0cafd9ae61
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builds/4chan-X.user.js
View File

@ -5682,9 +5682,15 @@
LiveLeak: {
regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/,
el: function(a) {
return $.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>"
var ret;
ret = $.el('iframe', {
width: "640",
height: "360",
src: "http://www.liveleak.com/ll_embed?i=" + a.dataset.uid,
frameborder: "0"
});
return ret.setAttribute("allowfullscreen", "true");
}
},
MediaCrush: {
@ -5844,9 +5850,13 @@
YouTube: {
regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/,
el: function(a) {
return $.el('iframe', {
var ret;
ret = $.el('iframe', {
src: "//www.youtube.com/embed/" + a.dataset.uid + (a.dataset.option ? '#' + a.dataset.option : '') + "?wmode=opaque"
});
ret.setAttribute("allowfullscreen", "true");
return ret;
},
title: {
api: function(uid) {

16
builds/crx/script.js
View File

@ -5687,9 +5687,15 @@
LiveLeak: {
regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/,
el: function(a) {
return $.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>"
var ret;
ret = $.el('iframe', {
width: "640",
height: "360",
src: "http://www.liveleak.com/ll_embed?i=" + a.dataset.uid,
frameborder: "0"
});
return ret.setAttribute("allowfullscreen", "true");
}
},
MediaCrush: {
@ -5849,9 +5855,13 @@
YouTube: {
regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/,
el: function(a) {
return $.el('iframe', {
var ret;
ret = $.el('iframe', {
src: "//www.youtube.com/embed/" + a.dataset.uid + (a.dataset.option ? '#' + a.dataset.option : '') + "?wmode=opaque"
});
ret.setAttribute("allowfullscreen", "true");
return ret;
},
title: {
api: function(uid) {

12
src/Linkification/Linkify.coffee
View File

@ -288,8 +288,12 @@ 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"
MediaCrush:
regExp: /.*(?:mediacru.sh\/)([0-9a-z_]+)/i
@ -404,8 +408,10 @@ Linkify =
YouTube:
regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/
el: (a) ->
$.el 'iframe',
ret = $.el 'iframe',
src: "//www.youtube.com/embed/#{a.dataset.uid}#{if a.dataset.option then '#' + a.dataset.option else ''}?wmode=opaque"
ret.setAttribute "allowfullscreen", "true"
ret
title:
api: (uid) -> "https://gdata.youtube.com/feeds/api/videos/#{uid}?alt=json&fields=title/text(),yt:noembed,app:control/yt:state/@reasonCode"
text: (data) -> data.entry.title.$t