Emoji is kill

LICENSE

@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.33 - 2014-08-17
+* appchan x - Version 2.9.33 - 2014-08-18
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

src/General/Config.coffee

@@ -775,23 +775,6 @@ Config =
         'Apply an SVG filter to the captcha to make it match your theme. WARNING: May cause invisible captchas.'
       ]
 
-    Indicators:
-      'Emoji': [
-        'enabled'
-        'Add icons besides usernames with triggered e-mails, like sega and neko.'
-        ['enabled', 'disable ponies', 'only ponies', 'disable']
-      ]
-      'Emoji Position': [
-        'before'
-        'Position of emoji icons.'
-        ['before', 'after']
-      ]
-      'Emoji Spacing': [
-        '5'
-        'Add some spacing between emoji and text.'
-        'text'
-      ]
-
   threadWatcher:
     'Current Board': [
       false

src/General/Main.coffee

@@ -114,7 +114,6 @@ Main =
 
     # c.timeEnd 'All initializations'
 
-    init 'Emoji',                     Emoji
     init 'Style',                     Style
     init 'Mascots',                   MascotTools
     init 'Rice',                      Rice
@@ -127,7 +126,6 @@ Main =
     init 'Index Generator',           Index
     init 'Announcement Hiding',       PSAHiding
     init 'Fourchan thingies',         Fourchan
-    init 'Emoji',                     Emoji
     init 'Color User IDs',            IDColor
     init 'Custom CSS',                CustomCSS
     init 'Linkify',                   Linkify

src/General/css/dynamic.css

@@ -51,13 +51,6 @@ body {
   margin-left: #{parseInt(Conf["Left Thread Padding"], 10) + editSpace["right"]}px;
   margin-right: #{parseInt(Conf["Right Thread Padding"], 10) + editSpace["left"]}px;
 }
-/* Emoji */
-a.useremail:last-of-type::before {
-  margin-right: #{parseInt Conf['Emoji Spacing']}px;
-}
-a.useremail:last-of-type::after {
-  margin-left: #{parseInt Conf['Emoji Spacing']}px;
-}
 #mascot {
   opacity: #{Conf['Mascot Opacity']};
 }

src/General/css/emoji.css

@@ -1,8 +0,0 @@
-.emoji-position-after:not(.emoji-disable):not(.emoji-#{pony = if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name}']:last-of-type::after,
-.emoji-position-after:not(.emoji-disable):not(.emoji-#{pony}) a.useremail[href*='#{name.toLowerCase()}']:last-of-type::after,
-.emoji-position-after:not(.emoji-disable):not(.emoji-#{pony}) a.useremail[href*='#{name.toUpperCase()}']:last-of-type::after,
-.emoji-position-before:not(.emoji-disable):not(.emoji-#{pony}) a.useremail[href*='#{name}']:last-of-type::before,
-.emoji-position-before:not(.emoji-disable):not(.emoji-#{pony}) a.useremail[href*='#{name.toLowerCase()}']:last-of-type::before,
-.emoji-position-before:not(.emoji-disable):not(.emoji-#{pony}) a.useremail[href*='#{name.toUpperCase()}']:last-of-type::before {
-  content: url('data:image/png;base64,#{icon}');
-}

src/General/css/emoji.sage.css

@@ -1,16 +0,0 @@
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,
-.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {
-  content: url('data:image/png;base64,<%= grunt.file.read("src/General/img/emoji/appchan-sage.png", {encoding: "base64"}) %>');
-}
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,
-.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {
-  content: url('data:image/png;base64,<%= grunt.file.read("src/General/img/emoji/SS-sage.png",      {encoding: "base64"}) %>');
-}

src/General/css/layout.css

@@ -1286,10 +1286,6 @@ div.post div.postInfo {
 s {
   text-decoration: none;
 }
-/* Emoji */
-a.useremail:last-of-type {
-  vertical-align: top;
-}
 /* OP */
 .watch-thread-link {
   vertical-align: bottom;

src/General/html/Settings/Advanced.html

@@ -94,16 +94,6 @@
   <span id=favicon-preview></span>
 </fieldset>
 
-<fieldset>
-  <legend>Emoji <span class=warning #{if Conf['Emoji'] then 'hidden' else ''}>is disabled.</span></legend>
-  <div>
-    Sage Icon: <select name=sageEmoji>
-      <option value="4chan SS">4chan SS</option>
-      <option value="appchan">appchan</option>
-    </select>
-    <span class=sage-icon-preview></span>
-  </div>
-
 <fieldset>
   <legend>Thread Updater <span class=warning #{if Conf['Thread Updater'] then 'hidden' else ''}>is disabled.</span></legend>
   <div>

src/Theming/Emoji.coffee

@@ -1,54 +0,0 @@
-Emoji =
-  init: ->
-    Emoji.icons['PlanNine'] = Emoji.icons['Plan9']
-
-  css: ->
-    css = []
-    
-    for key, category of Emoji.icons
-      continue unless Emoji.icons.hasOwnProperty key
-      for name, icon of category
-        continue unless category.hasOwnProperty name
-        css.push """<%= grunt.file.read('src/General/css/emoji.css').replace(/\s+/g, ' ').trim() %>"""
-
-    css.push """<%= grunt.file.read('src/General/css/emoji.sage.css').replace(/\s+/g, ' ').trim() %>"""
-    css.join ""
-
-  icons:
-    pony:
-      'Pinkie':     '<%= grunt.file.read("src/General/img/emoji/pinkie.png",     {encoding: "base64"}) %>'
-      'Applejack':  '<%= grunt.file.read("src/General/img/emoji/applejack.png",  {encoding: "base64"}) %>'
-      'Fluttershy': '<%= grunt.file.read("src/General/img/emoji/fluttershy.png", {encoding: "base64"}) %>'
-      'Twilight':   '<%= grunt.file.read("src/General/img/emoji/twilight.png",   {encoding: "base64"}) %>'
-      'Rainbow':    '<%= grunt.file.read("src/General/img/emoji/rainbow.png",    {encoding: "base64"}) %>'
-      'Rarity':     '<%= grunt.file.read("src/General/img/emoji/rarity.png",     {encoding: "base64"}) %>'
-      'Spike':      '<%= grunt.file.read("src/General/img/emoji/spike.png",      {encoding: "base64"}) %>'
-    not: 
-      'Plan9':      '<%= grunt.file.read("src/General/img/emoji/plan9.png",      {encoding: "base64"}) %>'
-      'Neko':       '<%= grunt.file.read("src/General/img/emoji/neko.png",       {encoding: "base64"}) %>'
-      'Madotsuki':  '<%= grunt.file.read("src/General/img/emoji/madotsuki.png",  {encoding: "base64"}) %>'
-      'Sega':       '<%= grunt.file.read("src/General/img/emoji/sega.png",       {encoding: "base64"}) %>'
-      'Sakamoto':   '<%= grunt.file.read("src/General/img/emoji/sakamoto.png",   {encoding: "base64"}) %>'
-      'Baka':       '<%= grunt.file.read("src/General/img/emoji/baka.png",       {encoding: "base64"}) %>'
-      'Ponyo':      '<%= grunt.file.read("src/General/img/emoji/ponyo.png",      {encoding: "base64"}) %>'
-      'Rabite':     '<%= grunt.file.read("src/General/img/emoji/rabite.png",     {encoding: "base64"}) %>'
-      'Arch':       '<%= grunt.file.read("src/General/img/emoji/arch.png",       {encoding: "base64"}) %>'
-      'CentOS':     '<%= grunt.file.read("src/General/img/emoji/centos.png",     {encoding: "base64"}) %>'
-      'Debian':     '<%= grunt.file.read("src/General/img/emoji/debian.png",     {encoding: "base64"}) %>'
-      'Elementary': '<%= grunt.file.read("src/General/img/emoji/elementary.png", {encoding: "base64"}) %>' 
-      'Fedora':     '<%= grunt.file.read("src/General/img/emoji/fedora.png",     {encoding: "base64"}) %>'
-      'FreeBSD':    '<%= grunt.file.read("src/General/img/emoji/freebsd.png",    {encoding: "base64"}) %>'
-      'Gentoo':     '<%= grunt.file.read("src/General/img/emoji/gentoo.png",     {encoding: "base64"}) %>'
-      'OpenSUSE': '<%= grunt.file.read("src/General/img/emoji/opensuse.png",     {encoding: "base64"}) %>'
-      'Mint':       '<%= grunt.file.read("src/General/img/emoji/mint.png",       {encoding: "base64"}) %>'
-      'Osx':        '<%= grunt.file.read("src/General/img/emoji/osx.png",        {encoding: "base64"}) %>'
-      'Rhel':       '<%= grunt.file.read("src/General/img/emoji/rhel.png",       {encoding: "base64"}) %>'
-      'Sabayon':    '<%= grunt.file.read("src/General/img/emoji/sabayon.png",    {encoding: "base64"}) %>'
-      'Slackware':  '<%= grunt.file.read("src/General/img/emoji/slackware.png",  {encoding: "base64"}) %>'
-      'Trisquel':   '<%= grunt.file.read("src/General/img/emoji/trisquel.png",   {encoding: "base64"}) %>'
-      'Ubuntu':     '<%= grunt.file.read("src/General/img/emoji/ubuntu.png",     {encoding: "base64"}) %>'
-      'Windows':    '<%= grunt.file.read("src/General/img/emoji/windows.png",    {encoding: "base64"}) %>'
-      'OpenBSD':    '<%= grunt.file.read("src/General/img/emoji/openbsd.png",    {encoding: "base64"}) %>'
-      'Gnu':        '<%= grunt.file.read("src/General/img/emoji/gnu.png",        {encoding: "base64"}) %>'
-      'CrunchBang': '<%= grunt.file.read("src/General/img/emoji/crunchbang.png", {encoding: "base64"}) %>'
-      'Yuno':       '<%= grunt.file.read("src/General/img/emoji/yuno.png",       {encoding: "base64"}) %>'