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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
This commit is contained in:
Zixaphir 2013-12-16 14:05:03 -07:00
commit b7d6fa2659
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builds/appchan-x.user.js
View File

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

16
builds/crx/script.js
View File

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

14
src/Linkification/Linkify.coffee
View File

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