Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

2013-08-14 03:46:50 -07:00 · 2013-08-14 03:46:50 -07:00 · 51482e7b65
commit 51482e7b65
parent 8442062fb3 2f074e0353
4 changed files with 6 additions and 823 deletions
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@ -160,6 +160,7 @@ Main =
    $.addClass doc, 'gecko'
    <% } %>
    $.addClass doc, 'fourchan-x'
+    $.addClass doc, 'seaweedchan'
    $.addClass doc, g.VIEW
    $.addStyle Main.css

--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@ -14,7 +14,7 @@ Linkify =
        # This should account for virtually all links posted without www or http:
        # If it misses any, screw it. No, I will not add canv.as
        [-a-z\d.]+[.](
-          com|net|org|co\.jp|us|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi|mp|ly
+          com|net|org|co\.jp|us|uk|ru|be|tv|xxx|edu|gov|cd|es|de|se|tk|dk|io|fm|fi|mp|ly|info
        )
        |
        # IPv4 Addresses