This commit is contained in:
Zixaphir 2013-08-06 23:49:52 -07:00
parent 70ca02a454
commit 70425ed7b9

View File

@ -6627,21 +6627,22 @@
}); });
}, },
node: function() { node: function() {
var data, embedder, i, len, node, range, snapshot, _i, _j, _len, _len1, _ref, _ref1; var data, el, i, items, node, range, snapshot;
if (this.isClone && Conf['Embedding']) { if (this.isClone) {
_ref = $$('.embedder', this.nodes.comment); if (Conf['Embedding']) {
for (_i = 0, _len = _ref.length; _i < _len; _i++) { i = 0;
embedder = _ref[_i]; items = $$('.embedded', this.nodes.comment);
$.on(embedder, "click", Linkify.cb.toggle); while (el = items[i++]) {
$.on(el, "click", Linkify.cb.toggle);
Linkify.cb.toggle.call(el);
}
} }
return; return;
} }
snapshot = $.X('.//text()', this.nodes.comment); snapshot = $.X('.//text()', this.nodes.comment);
i = -1; i = 0;
len = snapshot.snapshotLength; while (node = snapshot.snapshotItem(i++)) {
while (++i < len) {
node = snapshot.snapshotItem(i);
if (node.parentElement.nodeName === "A") { if (node.parentElement.nodeName === "A") {
continue; continue;
} }
@ -6654,9 +6655,9 @@
if (!(Conf['Embedding'] || Conf['Link Title'])) { if (!(Conf['Embedding'] || Conf['Link Title'])) {
return; return;
} }
_ref1 = this.nodes.links; items = this.nodes.links;
for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { i = 0;
range = _ref1[_j]; while (range = items[i++]) {
if (data = Linkify.services(range)) { if (data = Linkify.services(range)) {
if (Conf['Embedding']) { if (Conf['Embedding']) {
Linkify.embed(data); Linkify.embed(data);
@ -6761,31 +6762,40 @@
value = _ref[name]; value = _ref[name];
embed.dataset[name] = value; embed.dataset[name] = value;
} }
embed.dataset.nodedata = link.innerHTML;
$.addClass(link, "" + embed.dataset.key); $.addClass(link, "" + embed.dataset.key);
$.on(embed, 'click', Linkify.cb.toggle); $.on(embed, 'click', Linkify.cb.toggle);
$.after(link, [$.tn(' '), embed]); $.after(link, [$.tn(' '), embed]);
if (Conf['Auto-embed']) {
Linkify.cb.toggle.call(embed);
}
data.push(embed);
}, },
title: function(data) { title: function(data) {
var err, key, link, options, service, title, titles, uid; var embed, err, key, link, options, service, title, titles, uid;
key = data[0], uid = data[1], options = data[2], link = data[3]; key = data[0], uid = data[1], options = data[2], link = data[3], embed = data[4];
if (!(service = Linkify.types[key].title)) { if (!(service = Linkify.types[key].title)) {
return; return;
} }
titles = Conf['CachedTitles']; titles = Conf['CachedTitles'];
if (title = titles[uid]) { if (title = titles[uid]) {
link.textContent = title[0]; if (link) {
link.textContent = title[0];
}
if (Conf['Embedding']) { if (Conf['Embedding']) {
return link.nextElementSibling.dataset.title = title[0]; return embed.dataset.title = title[0];
} }
} else { } else {
try { try {
$.cache(service.api(uid), function() { $.cache(service.api(uid), function() {
return title = Linkify.cb.title.apply(this, [data]); return title = Linkify.cb.title(this, data);
}); });
} catch (_error) { } catch (_error) {
err = _error; err = _error;
link.innerHTML = "[" + key + "] <span class=warning>Title Link Blocked</span> (are you using NoScript?)</a>"; if (link) {
link.innerHTML = "[" + key + "] <span class=warning>Title Link Blocked</span> (are you using NoScript?)</a>";
}
return; return;
} }
if (title) { if (title) {
@ -6799,90 +6809,89 @@
}, },
cb: { cb: {
toggle: function() { toggle: function() {
var el, embed; var string, _ref;
embed = this.previousElementSibling; _ref = $.hasClass(this, "embedded") ? ['unembed', '(embed)'] : ['embed', '(unembed)'], string = _ref[0], this.textContent = _ref[1];
el = !this.className.contains("embedded") ? Linkify.cb.embed(this) : Linkify.cb.unembed(this); $.replace(this.previousElementSibling, Linkify.cb[string](this));
$.replace(embed, el);
return $.toggleClass(this, 'embedded'); return $.toggleClass(this, 'embedded');
}, },
embed: function(a) { embed: function(a) {
var el, style, type; var el, style, type;
el = (type = Linkify.types[a.dataset.key]).el.call(a); el = (type = Linkify.types[a.dataset.key]).el(a);
el.style.cssText = (style = type.style) ? style : "border: 0; width: 640px; height: 390px"; el.style.cssText = (style = type.style) ? style : "border: 0; width: 640px; height: 390px";
a.textContent = '(unembed)';
return el; return el;
}, },
unembed: function(a) { unembed: function(a) {
var el, href; var el;
href = a.dataset.href;
el = $.el('a', { el = $.el('a', {
rel: 'nofollow noreferrer', rel: 'nofollow noreferrer',
target: 'blank', target: 'blank',
className: 'linkify', className: 'linkify',
href: href, href: a.dataset.href,
textContent: a.dataset.title || href innerHTML: a.dataset.title || a.dataset.nodedata
}); });
a.textContent = '(embed)'; $.addClass(el, a.dataset.key);
$.addClass(el, "" + a.dataset.key);
return el; return el;
}, },
title: function(data) { title: function(response, data) {
var key, link, options, service, text, uid; var embed, key, link, options, service, text, uid;
key = data[0], uid = data[1], options = data[2], link = data[3]; key = data[0], uid = data[1], options = data[2], link = data[3], embed = data[4];
service = Linkify.types[key].title; service = Linkify.types[key].title;
return link.textContent = (function() { switch (response.status) {
switch (this.status) { case 200:
case 200: case 304:
case 304: text = "" + (service.text(JSON.parse(response.responseText)));
text = "" + (service.text.call(this)); if (Conf['Embedding']) {
if (Conf['Embedding']) { embed.dataset.title = text;
link.nextElementSibling.dataset.title = text; }
} break;
return text; case 404:
case 404: text = "[" + key + "] Not Found";
return "[" + key + "] Not Found"; break;
case 403: case 403:
return "[" + key + "] Forbidden or Private"; text = "[" + key + "] Forbidden or Private";
default: break;
return "[" + key + "] " + this.status + "'d"; default:
} text = "[" + key + "] " + this.status + "'d";
}).call(this); }
if (link) {
return link.textContent = text;
}
} }
}, },
types: { types: {
audio: { audio: {
regExp: /(.*\.(mp3|ogg|wav))$/, regExp: /(.*\.(mp3|ogg|wav))$/,
el: function() { el: function(a) {
return $.el('audio', { return $.el('audio', {
controls: 'controls', controls: 'controls',
preload: 'auto', preload: 'auto',
src: this.dataset.uid src: a.dataset.uid
}); });
} }
}, },
gist: { gist: {
regExp: /.*(?:gist.github.com.*\/)([^\/][^\/]*)$/, regExp: /.*(?:gist.github.com.*\/)([^\/][^\/]*)$/,
el: function() { el: function(a) {
var div; var div;
return div = $.el('iframe', { return div = $.el('iframe', {
src: "http://www.purplegene.com/script?url=https://gist.github.com/" + this.dataset.uid + ".js" src: "http://www.purplegene.com/script?url=https://gist.github.com/" + a.dataset.uid + ".js"
}); });
}, },
title: { title: {
api: function(uid) { api: function(uid) {
return "https://api.github.com/gists/" + uid; return "https://api.github.com/gists/" + uid;
}, },
text: function() { text: function(_arg) {
var file, response; var file, files;
response = JSON.parse(this.responseText).files; files = _arg.files;
for (file in response) { for (file in files) {
if (response.hasOwnProperty(file)) { if (files.hasOwnProperty(file)) {
return file; return file;
} }
} }
@ -6892,52 +6901,51 @@
image: { image: {
regExp: /(http|www).*\.(gif|png|jpg|jpeg|bmp)$/, regExp: /(http|www).*\.(gif|png|jpg|jpeg|bmp)$/,
style: 'border: 0; width: auto; height: auto;', style: 'border: 0; width: auto; height: auto;',
el: function() { el: function(a) {
return $.el('div', { return $.el('div', {
innerHTML: "<a target=_blank href='" + this.dataset.href + "'><img src='" + this.dataset.href + "'></a>" innerHTML: "<a target=_blank href='" + a.dataset.href + "'><img src='" + a.dataset.href + "'></a>"
}); });
} }
}, },
InstallGentoo: { InstallGentoo: {
regExp: /.*(?:paste.installgentoo.com\/view\/)([0-9a-z_]+)/, regExp: /.*(?:paste.installgentoo.com\/view\/)([0-9a-z_]+)/,
el: function() { el: function(a) {
return $.el('iframe', { return $.el('iframe', {
src: "http://paste.installgentoo.com/view/embed/" + this.dataset.uid src: "http://paste.installgentoo.com/view/embed/" + a.dataset.uid
}); });
} }
}, },
LiveLeak: { LiveLeak: {
regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/,
el: function() { el: function(a) {
return $.el('object', { return $.el('object', {
innerHTML: "<embed src='http://www.liveleak.com/e/" + this.dataset.uid + "?autostart=true' wmode='opaque' width='640' height='390' pluginspage='http://get.adobe.com/flashplayer/' type='application/x-shockwave-flash'></embed>" 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>"
}); });
} }
}, },
pastebin: { pastebin: {
regExp: /.*(?:pastebin.com\/(?!u\/))([^#\&\?]*).*/, regExp: /.*(?:pastebin.com\/(?!u\/))([^#\&\?]*).*/,
el: function() { el: function(a) {
var div; var div;
return div = $.el('iframe', { return div = $.el('iframe', {
src: "http://pastebin.com/embed_iframe.php?i=" + this.dataset.uid src: "http://pastebin.com/embed_iframe.php?i=" + a.dataset.uid
}); });
} }
}, },
SoundCloud: { SoundCloud: {
regExp: /.*(?:soundcloud.com\/|snd.sc\/)([^#\&\?]*).*/, regExp: /.*(?:soundcloud.com\/|snd.sc\/)([^#\&\?]*).*/,
style: 'height: auto; width: 500px; display: inline-block;', style: 'height: auto; width: 500px; display: inline-block;',
el: function() { el: function(a) {
var div; var div;
div = $.el('div', { div = $.el('div', {
className: "soundcloud", className: "soundcloud",
name: "soundcloud" name: "soundcloud"
}); });
$.ajax("//soundcloud.com/oembed?show_artwork=false&&maxwidth=500px&show_comments=false&format=json&url=https://www.soundcloud.com/" + this.dataset.uid, { $.ajax("//soundcloud.com/oembed?show_artwork=false&&maxwidth=500px&show_comments=false&format=json&url=https://www.soundcloud.com/" + a.dataset.uid, {
div: div,
onloadend: function() { onloadend: function() {
return this.div.innerHTML = JSON.parse(this.responseText).html; return div.innerHTML = JSON.parse(this.responseText).html;
} }
}, false); }, false);
return div; return div;
@ -6946,25 +6954,25 @@
api: function(uid) { api: function(uid) {
return "//soundcloud.com/oembed?show_artwork=false&&maxwidth=500px&show_comments=false&format=json&url=https://www.soundcloud.com/" + uid; return "//soundcloud.com/oembed?show_artwork=false&&maxwidth=500px&show_comments=false&format=json&url=https://www.soundcloud.com/" + uid;
}, },
text: function() { text: function(_) {
return JSON.parse(this.responseText).title; return _.title;
} }
} }
}, },
TwitchTV: { TwitchTV: {
regExp: /.*(?:twitch.tv\/)([^#\&\?]*).*/, regExp: /.*(?:twitch.tv\/)([^#\&\?]*).*/,
style: "border: none; width: 640px; height: 360px;", style: "border: none; width: 640px; height: 360px;",
el: function() { el: function(a) {
var channel, chapter, result, _; var channel, chapter, result, _;
if (result = /(\w+)\/(?:[a-z]\/)?(\d+)/i.exec(this.dataset.uid)) { if (result = /(\w+)\/(?:[a-z]\/)?(\d+)/i.exec(a.dataset.uid)) {
_ = result[0], channel = result[1], chapter = result[2]; _ = result[0], channel = result[1], chapter = result[2];
return $.el('object', { return $.el('object', {
data: 'http://www.twitch.tv/widgets/archive_embed_player.swf', data: 'http://www.twitch.tv/widgets/archive_embed_player.swf',
innerHTML: "<param name='allowFullScreen' value='true' />\n<param name='flashvars' value='channel=" + channel + "&start_volume=25&auto_play=false" + (chapter ? "&chapter_id=" + chapter : "") + "' />" innerHTML: "<param name='allowFullScreen' value='true' />\n<param name='flashvars' value='channel=" + channel + "&start_volume=25&auto_play=false" + (chapter ? "&chapter_id=" + chapter : "") + "' />"
}); });
} else { } else {
channel = (/(\w+)/.exec(this.dataset.uid))[0]; channel = (/(\w+)/.exec(a.dataset.uid))[0];
return $.el('object', { return $.el('object', {
data: "http://www.twitch.tv/widgets/live_embed_player.swf?channel=" + channel, data: "http://www.twitch.tv/widgets/live_embed_player.swf?channel=" + channel,
innerHTML: "<param name=\"allowFullScreen\" value=\"true\" />\n<param name=\"movie\" value=\"http://www.twitch.tv/widgets/live_embed_player.swf\" />\n<param name=\"flashvars\" value=\"hostname=www.twitch.tv&channel=" + channel + "&auto_play=true&start_volume=25\" />" innerHTML: "<param name=\"allowFullScreen\" value=\"true\" />\n<param name=\"movie\" value=\"http://www.twitch.tv/widgets/live_embed_player.swf\" />\n<param name=\"flashvars\" value=\"hostname=www.twitch.tv&channel=" + channel + "&auto_play=true&start_volume=25\" />"
@ -6975,50 +6983,50 @@
Vocaroo: { Vocaroo: {
regExp: /.*(?:vocaroo.com\/)([^#\&\?]*).*/, regExp: /.*(?:vocaroo.com\/)([^#\&\?]*).*/,
style: 'border: 0; width: 150px; height: 45px;', style: 'border: 0; width: 150px; height: 45px;',
el: function() { el: function(a) {
return $.el('object', { return $.el('object', {
innerHTML: "<embed src='http://vocaroo.com/player.swf?playMediaID=" + (this.dataset.uid.replace(/^i\//, '')) + "&autoplay=0' wmode='opaque' width='150' height='45' pluginspage='http://get.adobe.com/flashplayer/' type='application/x-shockwave-flash'></embed>" innerHTML: "<embed src='http://vocaroo.com/player.swf?playMediaID=" + (a.dataset.uid.replace(/^i\//, '')) + "&autoplay=0' wmode='opaque' width='150' height='45' pluginspage='http://get.adobe.com/flashplayer/' type='application/x-shockwave-flash'></embed>"
}); });
} }
}, },
Vimeo: { Vimeo: {
regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/, regExp: /.*(?:vimeo.com\/)([^#\&\?]*).*/,
el: function() { el: function(a) {
return $.el('iframe', { return $.el('iframe', {
src: "//player.vimeo.com/video/" + this.dataset.uid + "?wmode=opaque" src: "//player.vimeo.com/video/" + a.dataset.uid + "?wmode=opaque"
}); });
}, },
title: { title: {
api: function(uid) { api: function(uid) {
return "https://vimeo.com/api/oembed.json?url=http://vimeo.com/" + uid; return "https://vimeo.com/api/oembed.json?url=http://vimeo.com/" + uid;
}, },
text: function() { text: function(_) {
return JSON.parse(this.responseText).title; return _.title;
} }
} }
}, },
Vine: { Vine: {
regExp: /.*(?:vine.co\/)([^#\&\?]*).*/, regExp: /.*(?:vine.co\/)([^#\&\?]*).*/,
style: 'border: none; width: 500px; height: 500px;', style: 'border: none; width: 500px; height: 500px;',
el: function() { el: function(a) {
return $.el('iframe', { return $.el('iframe', {
src: "https://vine.co/" + this.dataset.uid + "/card" src: "https://vine.co/" + a.dataset.uid + "/card"
}); });
} }
}, },
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() { el: function(a) {
return $.el('iframe', { return $.el('iframe', {
src: "//www.youtube.com/embed/" + this.dataset.uid + (this.dataset.option ? '#' + this.dataset.option : '') + "?wmode=opaque" src: "//www.youtube.com/embed/" + a.dataset.uid + (a.dataset.option ? '#' + a.dataset.option : '') + "?wmode=opaque"
}); });
}, },
title: { title: {
api: function(uid) { api: function(uid) {
return "https://gdata.youtube.com/feeds/api/videos/" + uid + "?alt=json&fields=title/text(),yt:noembed,app:control/yt:state/@reasonCode"; return "https://gdata.youtube.com/feeds/api/videos/" + uid + "?alt=json&fields=title/text(),yt:noembed,app:control/yt:state/@reasonCode";
}, },
text: function() { text: function(data) {
return JSON.parse(this.responseText).entry.title.$t; return data.entry.title.$t;
} }
} }
} }