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

Merge remote-tracking branch 'origin/v3'

Browse Source 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-05-29 10:35:18 -07:00
commit e0f0eabee4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.9.28 - 2014-05-27 * appchan x - Version 2.9.28 - 2014-05-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

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

@ -25,7 +25,7 @@
// ==/UserScript== // ==/UserScript==
/* /*
* appchan x - Version 2.9.28 - 2014-05-27 * appchan x - Version 2.9.28 - 2014-05-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -8104,7 +8104,7 @@
ExpandComment.callbacks.push(this.node); ExpandComment.callbacks.push(this.node);
} }
if (Conf['Embedding'] || Conf['Link Title']) { if (Conf['Embedding'] || Conf['Link Title']) {
this.embedProcess = Function('link', "var data = this.services(link);\nif (data) {" + ((Conf['Embedding'] ? 'this.embed(data); ' : '') + (Conf['Link Title'] ? 'data.push(post); this.title(data);' : '')) + "}"); this.embedProcess = Function('link', 'post', "var data = this.services(link);\nif (data) {" + ((Conf['Embedding'] ? 'this.embed(data); ' : '') + (Conf['Link Title'] ? 'data.push(post); this.title(data);' : '')) + "}");
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Linkify', name: 'Linkify',

4
builds/crx/script.js
View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript // Generated by CoffeeScript
/* /*
* appchan x - Version 2.9.28 - 2014-05-27 * appchan x - Version 2.9.28 - 2014-05-29
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -8155,7 +8155,7 @@
ExpandComment.callbacks.push(this.node); ExpandComment.callbacks.push(this.node);
} }
if (Conf['Embedding'] || Conf['Link Title']) { if (Conf['Embedding'] || Conf['Link Title']) {
this.embedProcess = Function('link', "var data = this.services(link);\nif (data) {" + ((Conf['Embedding'] ? 'this.embed(data); ' : '') + (Conf['Link Title'] ? 'data.push(post); this.title(data);' : '')) + "}"); this.embedProcess = Function('link', 'post', "var data = this.services(link);\nif (data) {" + ((Conf['Embedding'] ? 'this.embed(data); ' : '') + (Conf['Link Title'] ? 'data.push(post); this.title(data);' : '')) + "}");
} }
return Post.callbacks.push({ return Post.callbacks.push({
name: 'Linkify', name: 'Linkify',

2
src/Linkification/Linkify.coffee
View File

@ -9,7 +9,7 @@ Linkify =
ExpandComment.callbacks.push @node ExpandComment.callbacks.push @node
if Conf['Embedding'] or Conf['Link Title'] if Conf['Embedding'] or Conf['Link Title']
@embedProcess = Function 'link', @embedProcess = Function 'link', 'post',
""" """
var data = this.services(link); var data = this.services(link);
if (data) {#{ if (data) {#{