From 4d0ce5da790729f99b41eb3a89edad486f42b0ac Mon Sep 17 00:00:00 2001 From: Zixaphir Date: Sun, 4 Aug 2013 18:33:19 -0700 Subject: [PATCH] Fix #396 --- builds/appchan-x.user.js | 4 ++-- builds/crx/script.js | 4 ++-- src/General/css/emoji.css | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 9cc8d6f1b..b703a57dd 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -10608,7 +10608,7 @@ return Emoji.icons['PlanNine'] = Emoji.icons['Plan9']; }, css: function() { - var category, css, icon, key, name, _conf, _ref; + var category, css, icon, key, name, pony, _conf, _ref; _conf = Conf; css = []; @@ -10623,7 +10623,7 @@ if (!category.hasOwnProperty(name)) { continue; } - css.push(".emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::after,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::before {\n content: url('data:image/png;base64," + icon + "');\n}\n"); + css.push(".emoji-position-after:not(.emoji-disable):not(.emoji-" + (pony = key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::after,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + name + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::before {\n content: url('data:image/png;base64," + icon + "');\n}\n"); } } css.push(".sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {\n content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAABa1BMVEUAAACqrKiCgYIAAAAAAAAAAACHmX5pgl5NUEx/hnx4hXRSUVMiIyKwrbFzn19SbkZ1d3OvtqtpaWhcX1ooMyRsd2aWkZddkEV8vWGcpZl+kHd7jHNdYFuRmI4bHRthaV5WhUFsfGZReUBFZjdJazpGVUBnamYfHB9TeUMzSSpHgS1cY1k1NDUyOC8yWiFywVBoh1lDSEAZHBpucW0ICQgUHhBjfFhCRUA+QTtEQUUBAQFyo1praWspKigWFRZHU0F6j3E9Oz5VWFN0j2hncWONk4sAAABASDxJWkJKTUgAAAAvNC0fJR0DAwMAAAA9QzoWGhQAAAA8YytvrFOJsnlqyT9oqExqtkdrsExpsUsqQx9rpVJDbzBBbi5utk9jiFRuk11iqUR64k5Wf0JIZTpadk5om1BkyjmF1GRNY0FheFdXpjVXhz86XSp2yFJwslR3w1NbxitbtDWW5nNnilhFXTtYqDRwp1dSijiJ7H99AAAAUnRSTlMAJTgNGQml71ypu3cPEN/RDh8HBbOwQN7wVg4CAQZ28vs9EDluXjo58Ge8xwMy0P3+rV8cT73sawEdTv63NAa3rQwo4cUdAl3hWQSWvS8qqYsjEDiCzAAAAIVJREFUeNpFx7GKAQAYAOD/A7GbZVAWZTBZFGQw6LyCF/MIkiTdcOmWSzYbJVE2u1KX0J1v+8QDv/EkyS0yXF/NgeEILiHfyc74mICTQltqYXBeAWU9HGxU09YqqEvAElGjyZYjPyLqitjzHSEiGkrsfMWr0VLe+oy/djGP//YwfbeP8bN3Or0bkqEVblAAAAAASUVORK5CYII=');\n}\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {\n content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAa9JREFUKFOdkt0rg2EUwM95b2zlL0CRRLngksznXrJsNtYW1tjYhM3mY6+IXZAbikhTKJp8XZAp81UmWYhIRHHhUi60e7s6ntdCa2449es8PfU7z+k5B6AbyuE/wQlc4BcO2d06unAUBCgFE0hianOd3NHIcy8NPwrUf9NBPZcOEi7ayXZiea/1V7+ljaXeYAfOgg2So2TOwQWGnwQafOgi962TnMFmatozUeNu4yetASspVvgXiUvii5K5Nm6z56ol3Hdtpy+cwSYy+HRUt1nLsoEato0kXyh6wTac+24brThWv6MNOYNW9prlG/uxmbRrFaT0VrCspZoNPSUNJNyCBcoiLZuhLH0o9U6UrAfGKCz7RlLM81Q8XUwqr4oKPLIQmnA8IupBigacVy7yrya/2JouhryJHJJNykg+UxLGOtz6+SQNpEiMcduls4Wvoli9WklVKz+ol5SU4U6ngql8Qj2eRI+GyajBhSRH4r3cUxhSeRVhsYBmWUWiyM+UMDmDUI2nsfuSC1I27nLgYZJlP8jhjJ3PY8iE+L8tWx4kQC6MQA5b1D9HNiRCFhx8AF/e2qh92VnKAAAAAElFTkSuQmCC');\n}"); diff --git a/builds/crx/script.js b/builds/crx/script.js index 4977efd02..b017d2ac3 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -10592,7 +10592,7 @@ return Emoji.icons['PlanNine'] = Emoji.icons['Plan9']; }, css: function() { - var category, css, icon, key, name, _conf, _ref; + var category, css, icon, key, name, pony, _conf, _ref; _conf = Conf; css = []; @@ -10607,7 +10607,7 @@ if (!category.hasOwnProperty(name)) { continue; } - css.push(".emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::after,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disabled):not(.emoji-" + (key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::before {\n content: url('data:image/png;base64," + icon + "');\n}\n"); + css.push(".emoji-position-after:not(.emoji-disable):not(.emoji-" + (pony = key === "pony" ? 'disable-ponies' : 'only-ponies') + ") a.useremail[href*='" + name + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::after,\n.emoji-position-after:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::after,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + name + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toLowerCase()) + "']:last-of-type::before,\n.emoji-position-before:not(.emoji-disable):not(.emoji-" + pony + ") a.useremail[href*='" + (name.toUpperCase()) + "']:last-of-type::before {\n content: url('data:image/png;base64," + icon + "');\n}\n"); } } css.push(".sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,\n.sage-highlighting-image.sage-image-appchan.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {\n content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAMAAAAolt3jAAABa1BMVEUAAACqrKiCgYIAAAAAAAAAAACHmX5pgl5NUEx/hnx4hXRSUVMiIyKwrbFzn19SbkZ1d3OvtqtpaWhcX1ooMyRsd2aWkZddkEV8vWGcpZl+kHd7jHNdYFuRmI4bHRthaV5WhUFsfGZReUBFZjdJazpGVUBnamYfHB9TeUMzSSpHgS1cY1k1NDUyOC8yWiFywVBoh1lDSEAZHBpucW0ICQgUHhBjfFhCRUA+QTtEQUUBAQFyo1praWspKigWFRZHU0F6j3E9Oz5VWFN0j2hncWONk4sAAABASDxJWkJKTUgAAAAvNC0fJR0DAwMAAAA9QzoWGhQAAAA8YytvrFOJsnlqyT9oqExqtkdrsExpsUsqQx9rpVJDbzBBbi5utk9jiFRuk11iqUR64k5Wf0JIZTpadk5om1BkyjmF1GRNY0FheFdXpjVXhz86XSp2yFJwslR3w1NbxitbtDWW5nNnilhFXTtYqDRwp1dSijiJ7H99AAAAUnRSTlMAJTgNGQml71ypu3cPEN/RDh8HBbOwQN7wVg4CAQZ28vs9EDluXjo58Ge8xwMy0P3+rV8cT73sawEdTv63NAa3rQwo4cUdAl3hWQSWvS8qqYsjEDiCzAAAAIVJREFUeNpFx7GKAQAYAOD/A7GbZVAWZTBZFGQw6LyCF/MIkiTdcOmWSzYbJVE2u1KX0J1v+8QDv/EkyS0yXF/NgeEILiHfyc74mICTQltqYXBeAWU9HGxU09YqqEvAElGjyZYjPyLqitjzHSEiGkrsfMWr0VLe+oy/djGP//YwfbeP8bN3Or0bkqEVblAAAAAASUVORK5CYII=');\n}\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='SAGE']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-after a.useremail[href*='Sage']:last-of-type::after,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='sage']:last-of-type::before,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='SAGE']:last-of-type::before,\n.sage-highlighting-image.sage-image-4chan-ss.sage-highlight-position-before a.useremail[href*='Sage']:last-of-type::before {\n content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAYAAACZ3F9/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAa9JREFUKFOdkt0rg2EUwM95b2zlL0CRRLngksznXrJsNtYW1tjYhM3mY6+IXZAbikhTKJp8XZAp81UmWYhIRHHhUi60e7s6ntdCa2449es8PfU7z+k5B6AbyuE/wQlc4BcO2d06unAUBCgFE0hianOd3NHIcy8NPwrUf9NBPZcOEi7ayXZiea/1V7+ljaXeYAfOgg2So2TOwQWGnwQafOgi962TnMFmatozUeNu4yetASspVvgXiUvii5K5Nm6z56ol3Hdtpy+cwSYy+HRUt1nLsoEato0kXyh6wTac+24brThWv6MNOYNW9prlG/uxmbRrFaT0VrCspZoNPSUNJNyCBcoiLZuhLH0o9U6UrAfGKCz7RlLM81Q8XUwqr4oKPLIQmnA8IupBigacVy7yrya/2JouhryJHJJNykg+UxLGOtz6+SQNpEiMcduls4Wvoli9WklVKz+ol5SU4U6ngql8Qj2eRI+GyajBhSRH4r3cUxhSeRVhsYBmWUWiyM+UMDmDUI2nsfuSC1I27nLgYZJlP8jhjJ3PY8iE+L8tWx4kQC6MQA5b1D9HNiRCFhx8AF/e2qh92VnKAAAAAElFTkSuQmCC');\n}"); diff --git a/src/General/css/emoji.css b/src/General/css/emoji.css index 4fefacfc3..9ecd37134 100644 --- a/src/General/css/emoji.css +++ b/src/General/css/emoji.css @@ -1,8 +1,8 @@ -.emoji-position-after:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name}']:last-of-type::after, -.emoji-position-after:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name.toLowerCase()}']:last-of-type::after, -.emoji-position-after:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name.toUpperCase()}']:last-of-type::after, -.emoji-position-before:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name}']:last-of-type::before, -.emoji-position-before:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name.toLowerCase()}']:last-of-type::before, -.emoji-position-before:not(.emoji-disabled):not(.emoji-#{if key is "pony" then 'disable-ponies' else 'only-ponies'}) a.useremail[href*='#{name.toUpperCase()}']:last-of-type::before { +.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}'); }\n \ No newline at end of file