Merge branch 'v3'

Conflicts:
	LICENSE
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-08-01 10:27:11 -07:00
commit 3922530efb
5 changed files with 7 additions and 11 deletions

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.2.1 - 2013-07-31
* appchan x - Version 2.2.1 - 2013-08-01
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -19,7 +19,7 @@
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
// ==/UserScript==
/*
* 4chan X - Version 1.2.24 - 2013-07-31
* 4chan X - Version 1.2.24 - 2013-08-01
*
* Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -675,9 +675,7 @@
};
$.open = function(URL) {
return $.open = function(URL) {
return GM_openInTab(URL);
};
return GM_openInTab(URL);
};
$.debounce = function(wait, fn) {

View File

@ -18,7 +18,7 @@
// ==/UserScript==
/*
* appchan x - Version 2.2.1 - 2013-07-31
* appchan x - Version 2.2.1 - 2013-08-01
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@ -3033,9 +3033,7 @@
};
$.open = function(URL) {
return $.open = function(URL) {
return GM_openInTab(URL);
};
return GM_openInTab(URL);
};
$.debounce = function(wait, fn) {

View File

@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
* appchan x - Version 2.2.1 - 2013-07-31
* appchan x - Version 2.2.1 - 2013-08-01
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -221,7 +221,7 @@ $.event = (event, detail, root=d) ->
$.open = (URL) ->
<% if (type === 'userscript') { %>
$.open = (URL) -> GM_openInTab URL
GM_openInTab URL
<% } else { %>
window.open URL, '_blank'
<% } %>