IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UX: Better emoji escaping for topic title (#7176)" (#7201)

Browse Source 
This reverts commit 0d9bc0aaa6.
This commit is contained in:
Régis Hanol
2019-03-19 12:02:47 +01:00
committed by GitHub
parent 31e06dbcd2
commit 6fb49e74a1
7 changed files with 25 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pretty_text.rb
View File

@@ -227,7 +227,7 @@ module PrettyText
end
def self.unescape_emoji(title)
return title unless SiteSetting.enable_emoji? && title
return title unless SiteSetting.enable_emoji?
set = SiteSetting.emoji_set.inspect
custom = Emoji.custom.map { |e| [e.name, e.url] }.to_h.to_json
@@ -239,16 +239,6 @@ module PrettyText
end
end
def self.escape_emoji(title)
return unless title
protect do
v8.eval(<<~JS)
__performEmojiEscape(#{title.inspect});
JS
end
end
def self.cook(text, opts = {})
options = opts.dup

1
lib/pretty_text/shims.js
View File

@@ -1,7 +1,6 @@
__PrettyText = require("pretty-text/pretty-text").default;
__buildOptions = require("pretty-text/pretty-text").buildOptions;
__performEmojiUnescape = require("pretty-text/emoji").performEmojiUnescape;
__performEmojiEscape = require("pretty-text/emoji").performEmojiEscape;
__utils = require("discourse/lib/utilities");