Merge pull request 'turning off unicode emoji (for now...?)' (#355) from TheUnicodeDefeatium into master

Reviewed-on: #355
2020-10-29 15:41:36 -07:00 · 2020-10-29 15:41:36 -07:00 · 48d375f007
parent f2a4c61610 223936cda8
commit 48d375f007
2 changed files with 2 additions and 2 deletions
--- a/qml/main.qml
+++ b/qml/main.qml
@ -45,7 +45,7 @@ ApplicationWindow {
        T.twemoji.ext = ".png"
        T.twemoji.size = "72x72"
        T.twemoji.className = "\" height=\""+size+"\" width=\""+size
-        var retText = T.twemoji.parse(Utils.htmlEscaped(text))
+        var retText = Utils.htmlEscaped(text)//T.twemoji.parse(Utils.htmlEscaped(text))//
        retText = retText.replace(/\n/g,"<br/>")

        // mutant standard stickers
--- a/qml/opaque
+++ b/qml/opaque
@ -1 +1 @@
-Subproject commit c530045798eea1a4ad7ed65db11c815d2fe0c63b
+Subproject commit 925796d468b208787e232c06d18f77c219686a45