Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-04-03 16:25:45 -07:00
commit b18edaa764
3 changed files with 3 additions and 3 deletions

View File

@ -8071,7 +8071,7 @@
ExpandComment.callbacks.push(this.node);
}
if (Conf['Embedding'] || Conf['Link Title']) {
this.embedProcess = Function('link', "var data = this.services(link); if (data) { " + ((Conf['Embedding'] ? 'this.embed(data);\n' : '') + (Conf['Title Link'] ? 'this.title(data);' : '')) + " }");
this.embedProcess = Function('link', "var data = this.services(link); if (data) { " + ((Conf['Embedding'] ? 'this.embed(data);\n' : '') + (Conf['Link Title'] ? 'this.title(data);' : '')) + " }");
}
return Post.callbacks.push({
name: 'Linkify',

View File

@ -8124,7 +8124,7 @@
ExpandComment.callbacks.push(this.node);
}
if (Conf['Embedding'] || Conf['Link Title']) {
this.embedProcess = Function('link', "var data = this.services(link); if (data) { " + ((Conf['Embedding'] ? 'this.embed(data);\n' : '') + (Conf['Title Link'] ? 'this.title(data);' : '')) + " }");
this.embedProcess = Function('link', "var data = this.services(link); if (data) { " + ((Conf['Embedding'] ? 'this.embed(data);\n' : '') + (Conf['Link Title'] ? 'this.title(data);' : '')) + " }");
}
return Post.callbacks.push({
name: 'Linkify',

View File

@ -14,7 +14,7 @@ Linkify =
if (data) {
#{
(if Conf['Embedding'] then 'this.embed(data);\n' else '') +
if Conf['Title Link'] then 'this.title(data);' else ''
if Conf['Link Title'] then 'this.title(data);' else ''
}
}
"