You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2023/04/06 00:11:08 UTC
[allura] branch master updated: [#8501] Removed twemoji
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new 071bb27be [#8501] Removed twemoji
071bb27be is described below
commit 071bb27beafb1c01c88f16f6a691058815149a9c
Author: Ellery Alvarez <el...@hotmail.com>
AuthorDate: Tue Apr 4 18:50:33 2023 -0600
[#8501] Removed twemoji
---
Allura/allura/lib/widgets/resources/js/reactions.js | 3 +--
Allura/allura/nf/allura/css/site_style.css | 1 +
Allura/allura/public/nf/js/allura-base.js | 3 ---
Allura/allura/public/nf/js/twemoji.min.js | 2 --
Allura/allura/templates/jinja_master/master.html | 1 -
Allura/allura/templates_responsive/jinja_master/master.html | 1 -
LICENSE | 5 -----
rat-excludes.txt | 1 -
8 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Allura/allura/lib/widgets/resources/js/reactions.js b/Allura/allura/lib/widgets/resources/js/reactions.js
index b45aad047..c0fe90706 100644
--- a/Allura/allura/lib/widgets/resources/js/reactions.js
+++ b/Allura/allura/lib/widgets/resources/js/reactions.js
@@ -55,7 +55,7 @@ $(function () {
var emohtml = '';
for (var emo in global_reactions) {
emohtml += '<div class=\'emoji_button' + (currentemoji == emo ? ' current' : '') + '\' data-emoji=\'' + emo + '\'>' +
- twemoji.parse(global_reactions[emo]) + '</div>';
+ global_reactions[emo] + '</div>';
}
var tooltiptext = '<div class="post-reactions-list">' + emohtml + '</div>';
$(this).tooltipster('content', tooltiptext);
@@ -104,7 +104,6 @@ function reactComment(btn, r) {
}
reacts_list.html(react_html);
- twemoji.parse(reacts_list[0]);
btn.tooltipster('hide');
// attach events to newly added dom
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 48293e68e..b2ca323bc 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3844,6 +3844,7 @@ fieldset.preferences legend {
margin-left: 1px;
display: inline-block;
border: transparent solid 1px;
+ cursor: pointer;
}
.post-reactions-list .current {
diff --git a/Allura/allura/public/nf/js/allura-base.js b/Allura/allura/public/nf/js/allura-base.js
index 6d0171eb6..779f4ebca 100644
--- a/Allura/allura/public/nf/js/allura-base.js
+++ b/Allura/allura/public/nf/js/allura-base.js
@@ -225,9 +225,6 @@ $(function(){
return false;
});
- twemoji.size = '72x72';
- twemoji.parse($('#content_base')[0]);
-
$('.lightbox').click(function(e) {
var image_source = $(this).data("src") || $(this).attr('href');
if ($('#lightbox').length === 0) {
diff --git a/Allura/allura/public/nf/js/twemoji.min.js b/Allura/allura/public/nf/js/twemoji.min.js
deleted file mode 100644
index e4c9e1bc1..000000000
--- a/Allura/allura/public/nf/js/twemoji.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! Copyright Twitter Inc. and other contributors. Licensed under MIT */
-var twemoji=function(){"use strict";var twemoji={base:"https://twemoji.maxcdn.com/2/",ext:".png",size:"72x72",className:"emoji",convert:{fromCodePoint:fromCodePoint,toCodePoint:toCodePoint},onerror:function onerror(){if(this.parentNode){this.parentNode.replaceChild(createText(this.alt,false),this)}},parse:parse,replace:replace,test:test},escaper={"&":"&","<":"<",">":">","'":"'",'"':"""},re=/(?:\ud83d[\udc68\udc69])(?:\ud83c[\udffb-\udfff])?\u200d(?:\u2695\ufe0f|\u2696\ [...]
\ No newline at end of file
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index b6f2d8828..72c03bc2d 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -26,7 +26,6 @@
{% do g.register_forge_js('js/jquery.cookie-1.4.1.js', location='head_js') %}
{% do g.register_forge_js('js/jquery.notify.js') %}
{% do g.register_forge_js('js/jquery.tooltipster.js') %}
-{% do g.register_forge_js('js/twemoji.min.js') %}
{% do g.register_forge_js('js/allura-base.js') %}
{% do g.register_forge_js('js/checklist.js') %}
{% do g.register_forge_css('css/forge/hilite.css') %}
diff --git a/Allura/allura/templates_responsive/jinja_master/master.html b/Allura/allura/templates_responsive/jinja_master/master.html
index 2083147dd..be687919c 100644
--- a/Allura/allura/templates_responsive/jinja_master/master.html
+++ b/Allura/allura/templates_responsive/jinja_master/master.html
@@ -27,7 +27,6 @@
{% do g.register_forge_js('js/foundation.min.js', location='head_js', compress=False) %}
{% do g.register_forge_js('js/jquery.notify.js') %}
{% do g.register_forge_js('js/jquery.tooltipster.js') %}{# TODO: use foundation #}
-{% do g.register_forge_js('js/twemoji.min.js') %}
{% do g.register_forge_js('js/allura-base.js') %}
{% do g.register_forge_js('js/checklist.js') %}
{% do g.register_forge_css('css/forge/hilite.css') %}
diff --git a/LICENSE b/LICENSE
index 6ebddf34c..f27cd3e5a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -269,11 +269,6 @@ For details, see:
Allura/allura/public/nf/css/font-awesome.min.css
Allura/allura/public/nf/fonts/
-Twitter's Twemoji, which is available under the MIT license (for the code) and Graphics licensed under CC-BY 4.0
-Source code available at https://github.com/twitter/twemoji
-For details, see:
- Allura/allura/public/nf/js/twemoji.min.js
-
EasyMDE markdown editor (https://github.com/Ionaru/easy-markdown-editor) is available under the MIT
license. For details, see:
Allura/allura/lib/widgets/resources/js/easymde.min.js
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 650c9ce69..c819b7f07 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -59,7 +59,6 @@ Allura/allura/public/nf/js/react-dom.production.min.js
Allura/allura/public/nf/js/react-drag.min.js
Allura/allura/public/nf/js/react-reorderable.min.js
Allura/allura/public/nf/js/Sortable.min.js
-Allura/allura/public/nf/js/twemoji.min.js
Allura/allura/public/nf/js/underscore-1.13.6.min.js
Allura/allura/tests/data/test_mime/text_file.txt
Allura/docs/make.bat