Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-02-16 02:28:12 -07:00
commit 32ef5929cd
3 changed files with 8 additions and 2 deletions

View File

@ -7877,6 +7877,8 @@
try {
$.cache(service.api(uid), function() {
return title = Linkify.cb.title(this, data);
}, {
responseType: 'json'
});
} catch (_error) {
err = _error;

View File

@ -7911,6 +7911,8 @@
try {
$.cache(service.api(uid), function() {
return title = Linkify.cb.title(this, data);
}, {
responseType: 'json'
});
} catch (_error) {
err = _error;

View File

@ -189,8 +189,10 @@ Linkify =
embed.dataset.title = title[0]
else
try
$.cache service.api(uid), ->
title = Linkify.cb.title @, data
$.cache service.api(uid),
-> title = Linkify.cb.title @, data
,
responseType: 'json'
catch err
if link
link.innerHTML = "[#{key}] <span class=warning>Title Link Blocked</span> (are you using NoScript?)</a>"