diff --git a/img/emoji/1F355.svg b/img/emoji/1F355.svg deleted file mode 100755 index e30d66968c..0000000000 --- a/img/emoji/1F355.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F575.svg b/img/emoji/1F575.svg deleted file mode 100755 index 5e526ed1d8..0000000000 --- a/img/emoji/1F575.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F601.svg b/img/emoji/1F601.svg deleted file mode 100755 index 35e323b7de..0000000000 --- a/img/emoji/1F601.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F603.svg b/img/emoji/1F603.svg deleted file mode 100755 index 221677ba69..0000000000 --- a/img/emoji/1F603.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F604.svg b/img/emoji/1F604.svg deleted file mode 100755 index 8589fef0c8..0000000000 --- a/img/emoji/1F604.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F608.svg b/img/emoji/1F608.svg deleted file mode 100755 index 77df88dc5b..0000000000 --- a/img/emoji/1F608.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F612.svg b/img/emoji/1F612.svg deleted file mode 100755 index 39ef8d663b..0000000000 --- a/img/emoji/1F612.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F613.svg b/img/emoji/1F613.svg deleted file mode 100755 index ced38d1e2d..0000000000 --- a/img/emoji/1F613.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F616.svg b/img/emoji/1F616.svg deleted file mode 100755 index b483f2e000..0000000000 --- a/img/emoji/1F616.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F619.svg b/img/emoji/1F619.svg deleted file mode 100755 index e534674f5f..0000000000 --- a/img/emoji/1F619.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F622.svg b/img/emoji/1F622.svg deleted file mode 100755 index f2a9fb46e7..0000000000 --- a/img/emoji/1F622.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F623.svg b/img/emoji/1F623.svg deleted file mode 100755 index 277947634d..0000000000 --- a/img/emoji/1F623.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F635.svg b/img/emoji/1F635.svg deleted file mode 100755 index 241e1963e1..0000000000 --- a/img/emoji/1F635.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/emoji/1F610.svg b/img/emoji/Ambivalent.svg similarity index 100% rename from img/emoji/1F610.svg rename to img/emoji/Ambivalent.svg diff --git a/img/emoji/1F620.svg b/img/emoji/Angry.svg similarity index 100% rename from img/emoji/1F620.svg rename to img/emoji/Angry.svg diff --git a/img/emoji/1F632.svg b/img/emoji/Astonished.svg similarity index 100% rename from img/emoji/1F632.svg rename to img/emoji/Astonished.svg diff --git a/img/emoji/Beer.svg b/img/emoji/Beer.svg new file mode 100755 index 0000000000..0a28d29ec6 --- /dev/null +++ b/img/emoji/Beer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/emoji/1F37B.svg b/img/emoji/Beers.svg similarity index 100% rename from img/emoji/1F37B.svg rename to img/emoji/Beers.svg diff --git a/img/emoji/1F354.svg b/img/emoji/Burger.svg similarity index 100% rename from img/emoji/1F354.svg rename to img/emoji/Burger.svg diff --git a/img/emoji/1F382.svg b/img/emoji/Cake.svg similarity index 100% rename from img/emoji/1F382.svg rename to img/emoji/Cake.svg diff --git a/img/emoji/Cocktail.svg b/img/emoji/Cocktail.svg new file mode 100755 index 0000000000..a8c613d941 --- /dev/null +++ b/img/emoji/Cocktail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/emoji/1F62A.svg b/img/emoji/ColdSweat.svg similarity index 100% rename from img/emoji/1F62A.svg rename to img/emoji/ColdSweat.svg diff --git a/img/emoji/1F628.svg b/img/emoji/Confused.svg similarity index 100% rename from img/emoji/1F628.svg rename to img/emoji/Confused.svg diff --git a/img/emoji/1F60E.svg b/img/emoji/Cool.svg similarity index 100% rename from img/emoji/1F60E.svg rename to img/emoji/Cool.svg diff --git a/img/emoji/1F625.svg b/img/emoji/Cry.svg similarity index 100% rename from img/emoji/1F625.svg rename to img/emoji/Cry.svg diff --git a/img/emoji/1F61E.svg b/img/emoji/Disappointed.svg similarity index 100% rename from img/emoji/1F61E.svg rename to img/emoji/Disappointed.svg diff --git a/img/emoji/1F611.svg b/img/emoji/Expressionless.svg similarity index 100% rename from img/emoji/1F611.svg rename to img/emoji/Expressionless.svg diff --git a/img/emoji/1F44A.svg b/img/emoji/Facepunch.svg similarity index 100% rename from img/emoji/1F44A.svg rename to img/emoji/Facepunch.svg diff --git a/img/emoji/1F627.svg b/img/emoji/Fearful.svg similarity index 100% rename from img/emoji/1F627.svg rename to img/emoji/Fearful.svg diff --git a/img/emoji/1F525.svg b/img/emoji/Fire.svg similarity index 100% rename from img/emoji/1F525.svg rename to img/emoji/Fire.svg diff --git a/img/emoji/1F633.svg b/img/emoji/Flushed.svg similarity index 100% rename from img/emoji/1F633.svg rename to img/emoji/Flushed.svg diff --git a/img/emoji/1F61F.svg b/img/emoji/Frown.svg similarity index 100% rename from img/emoji/1F61F.svg rename to img/emoji/Frown.svg diff --git a/img/emoji/1F624.svg b/img/emoji/Furious.svg similarity index 100% rename from img/emoji/1F624.svg rename to img/emoji/Furious.svg diff --git a/img/emoji/1F62E.svg b/img/emoji/Gasp.svg similarity index 100% rename from img/emoji/1F62E.svg rename to img/emoji/Gasp.svg diff --git a/img/emoji/1F62F.svg b/img/emoji/Gasp2.svg similarity index 100% rename from img/emoji/1F62F.svg rename to img/emoji/Gasp2.svg diff --git a/img/emoji/1F62C.svg b/img/emoji/Grin.svg similarity index 100% rename from img/emoji/1F62C.svg rename to img/emoji/Grin.svg diff --git a/img/emoji/2764.svg b/img/emoji/Heart.svg similarity index 100% rename from img/emoji/2764.svg rename to img/emoji/Heart.svg diff --git a/img/emoji/1F60D.svg b/img/emoji/Hearteyes.svg similarity index 100% rename from img/emoji/1F60D.svg rename to img/emoji/Hearteyes.svg diff --git a/img/emoji/1F607.svg b/img/emoji/Innocent.svg similarity index 100% rename from img/emoji/1F607.svg rename to img/emoji/Innocent.svg diff --git a/img/emoji/1F602.svg b/img/emoji/Joy.svg similarity index 100% rename from img/emoji/1F602.svg rename to img/emoji/Joy.svg diff --git a/img/emoji/1F617.svg b/img/emoji/Kissing.svg similarity index 100% rename from img/emoji/1F617.svg rename to img/emoji/Kissing.svg diff --git a/img/emoji/1F61A.svg b/img/emoji/KissingClosedEyes.svg similarity index 100% rename from img/emoji/1F61A.svg rename to img/emoji/KissingClosedEyes.svg diff --git a/img/emoji/1F618.svg b/img/emoji/KissingHeart.svg similarity index 100% rename from img/emoji/1F618.svg rename to img/emoji/KissingHeart.svg diff --git a/img/emoji/1F600.svg b/img/emoji/Laughing.svg similarity index 100% rename from img/emoji/1F600.svg rename to img/emoji/Laughing.svg diff --git a/img/emoji/1F637.svg b/img/emoji/Mask.svg similarity index 100% rename from img/emoji/1F637.svg rename to img/emoji/Mask.svg diff --git a/img/emoji/1F56B.svg b/img/emoji/Mega.svg similarity index 100% rename from img/emoji/1F56B.svg rename to img/emoji/Mega.svg diff --git a/img/emoji/1F4AA.svg b/img/emoji/Muscle.svg similarity index 100% rename from img/emoji/1F4AA.svg rename to img/emoji/Muscle.svg diff --git a/img/emoji/1F621.svg b/img/emoji/Naughty.svg similarity index 100% rename from img/emoji/1F621.svg rename to img/emoji/Naughty.svg diff --git a/img/emoji/1F636.svg b/img/emoji/NoMouth.svg similarity index 100% rename from img/emoji/1F636.svg rename to img/emoji/NoMouth.svg diff --git a/img/emoji/1F626.svg b/img/emoji/OpenMouth.svg similarity index 100% rename from img/emoji/1F626.svg rename to img/emoji/OpenMouth.svg diff --git a/img/emoji/1F389.svg b/img/emoji/Party.svg similarity index 100% rename from img/emoji/1F389.svg rename to img/emoji/Party.svg diff --git a/img/emoji/1F357.svg b/img/emoji/PoultryLeg.svg similarity index 100% rename from img/emoji/1F357.svg rename to img/emoji/PoultryLeg.svg diff --git a/img/emoji/1F60A.svg b/img/emoji/Relaxed.svg similarity index 100% rename from img/emoji/1F60A.svg rename to img/emoji/Relaxed.svg diff --git a/img/emoji/1F60C.svg b/img/emoji/Relieved.svg similarity index 100% rename from img/emoji/1F60C.svg rename to img/emoji/Relieved.svg diff --git a/img/emoji/1F614.svg b/img/emoji/Sad.svg similarity index 100% rename from img/emoji/1F614.svg rename to img/emoji/Sad.svg diff --git a/img/emoji/1F606.svg b/img/emoji/Satisfied.svg similarity index 100% rename from img/emoji/1F606.svg rename to img/emoji/Satisfied.svg diff --git a/img/emoji/1F631.svg b/img/emoji/Scream.svg similarity index 100% rename from img/emoji/1F631.svg rename to img/emoji/Scream.svg diff --git a/img/emoji/1F615.svg b/img/emoji/Slant.svg similarity index 100% rename from img/emoji/1F615.svg rename to img/emoji/Slant.svg diff --git a/img/emoji/1F634.svg b/img/emoji/Sleeping.svg similarity index 100% rename from img/emoji/1F634.svg rename to img/emoji/Sleeping.svg diff --git a/img/emoji/1F642.svg b/img/emoji/Smile.svg similarity index 100% rename from img/emoji/1F642.svg rename to img/emoji/Smile.svg diff --git a/img/emoji/1F60F.svg b/img/emoji/Smirk.svg similarity index 100% rename from img/emoji/1F60F.svg rename to img/emoji/Smirk.svg diff --git a/img/emoji/1F62D.svg b/img/emoji/Sob.svg similarity index 100% rename from img/emoji/1F62D.svg rename to img/emoji/Sob.svg diff --git a/img/emoji/1F61B.svg b/img/emoji/StuckOutTongue.svg similarity index 100% rename from img/emoji/1F61B.svg rename to img/emoji/StuckOutTongue.svg diff --git a/img/emoji/1F61D.svg b/img/emoji/StuckOutTongueClosedEyes.svg similarity index 100% rename from img/emoji/1F61D.svg rename to img/emoji/StuckOutTongueClosedEyes.svg diff --git a/img/emoji/1F61C.svg b/img/emoji/StuckOutTongueWinkingEye.svg similarity index 100% rename from img/emoji/1F61C.svg rename to img/emoji/StuckOutTongueWinkingEye.svg diff --git a/img/emoji/1F31E.svg b/img/emoji/Sun.svg similarity index 100% rename from img/emoji/1F31E.svg rename to img/emoji/Sun.svg diff --git a/img/emoji/1F605.svg b/img/emoji/Sweet.svg similarity index 100% rename from img/emoji/1F605.svg rename to img/emoji/Sweet.svg diff --git a/img/emoji/1F593.svg b/img/emoji/ThumbsDown.svg similarity index 100% rename from img/emoji/1F593.svg rename to img/emoji/ThumbsDown.svg diff --git a/img/emoji/1F592.svg b/img/emoji/ThumbsUp.svg similarity index 100% rename from img/emoji/1F592.svg rename to img/emoji/ThumbsUp.svg diff --git a/img/emoji/1F62B.svg b/img/emoji/TiredFace.svg similarity index 100% rename from img/emoji/1F62B.svg rename to img/emoji/TiredFace.svg diff --git a/img/emoji/1F629.svg b/img/emoji/Weary.svg similarity index 100% rename from img/emoji/1F629.svg rename to img/emoji/Weary.svg diff --git a/img/emoji/1F609.svg b/img/emoji/Wink.svg similarity index 100% rename from img/emoji/1F609.svg rename to img/emoji/Wink.svg diff --git a/img/emoji/1F641.svg b/img/emoji/Worried.svg similarity index 100% rename from img/emoji/1F641.svg rename to img/emoji/Worried.svg diff --git a/img/emoji/1F60B.svg b/img/emoji/Yum.svg similarity index 100% rename from img/emoji/1F60B.svg rename to img/emoji/Yum.svg diff --git a/protected/humhub/widgets/RichText.php b/protected/humhub/widgets/RichText.php index cd50382f93..821e841970 100644 --- a/protected/humhub/widgets/RichText.php +++ b/protected/humhub/widgets/RichText.php @@ -84,18 +84,16 @@ class RichText extends \yii\base\Widget public static function translateEmojis($text, $show = true) { $emojis = array( - "1F601", "1F602", "1F603", "1F604", "1F605", "1F606", - "1F607", "1F608", "1F609", "1F610", "1F611", "1F612", - "1F613", "1F614", "1F615", "1F616", "1F617", "1F618", - "1F619", "1F620", "1F621", "1F622", "1F623", "1F624", - "1F625", "1F626", "1F627", "1F628", "1F629", "1F631", - "1F632", "1F633", "1F634", "1F635", "1F636", "1F637", - "1F641", "1F642", "1F60A", "1F60B", "1F60C", "1F60D", - "1F60E", "1F60F", "1F61A", "1F61B", "1F61C", "1F61D", - "1F61E", "1F61F", "1F62A", "1F62B", "1F62C", "1F62D", - "1F62E", "1F62F", "1F44A", "1F592", "1F593", "2764", - "1F389", "1F525", "1F37B", "1F382", "1F354", "1F355", - "1F357", "1F56B", "1F575", "1F31E" + "Relaxed", "Yum", "Relieved", "Hearteyes", "Cool", "Smirk", + "KissingClosedEyes", "StuckOutTongue", "StuckOutTongueWinkingEye", "StuckOutTongueClosedEyes", "Disappointed", "Frown", + "ColdSweat", "TiredFace", "Grin", "Sob", "Gasp", "Gasp2", + "Laughing", "Joy", "Sweet", "Satisfied", "Innocent", "Wink", + "Ambivalent", "Expressionless", "Sad", "Slant", "Worried", "Kissing", + "KissingHeart", "Angry", "Naughty", "Furious", "Cry", "OpenMouth", + "Fearful", "Confused", "Weary", "Scream", "Astonished", "Flushed", + "Sleeping", "NoMouth", "Mask", "Worried", "Smile", "Muscle", + "Facepunch", "ThumbsUp", "ThumbsDown", "Beers", "Cocktail", "Burger", + "PoultryLeg", "Party", "Cake", "Sun", "Fire", "Heart" ); return preg_replace_callback('@;(.*?);@', function($hit) use(&$show, &$emojis) { diff --git a/protected/humhub/widgets/views/richTextEditor.php b/protected/humhub/widgets/views/richTextEditor.php index bd4fddbee5..fdd6244412 100644 --- a/protected/humhub/widgets/views/richTextEditor.php +++ b/protected/humhub/widgets/views/richTextEditor.php @@ -24,18 +24,16 @@ use yii\helpers\Url; } var emojis = [ - "1F601", "1F602", "1F603", "1F604", "1F605", "1F606", - "1F607", "1F608", "1F609", "1F610", "1F611", "1F612", - "1F613", "1F614", "1F615", "1F616", "1F617", "1F618", - "1F619", "1F620", "1F621", "1F622", "1F623", "1F624", - "1F625", "1F626", "1F627", "1F628", "1F629", "1F631", - "1F632", "1F633", "1F634", "1F635", "1F636", "1F637", - "1F641", "1F642", "1F60A", "1F60B", "1F60C", "1F60D", - "1F60E", "1F60F", "1F61A", "1F61B", "1F61C", "1F61D", - "1F61E", "1F61F", "1F62A", "1F62B", "1F62C", "1F62D", - "1F62E", "1F62F", "1F44A", "1F592", "1F593", "2764", - "1F389", "1F525", "1F37B", "1F382", "1F354", "1F355", - "1F357", "1F56B", "1F575", "1F31E" + "Relaxed", "Yum", "Relieved", "Hearteyes", "Cool", "Smirk", + "KissingClosedEyes", "StuckOutTongue", "StuckOutTongueWinkingEye", "StuckOutTongueClosedEyes", "Disappointed", "Frown", + "ColdSweat", "TiredFace", "Grin", "Sob", "Gasp", "Gasp2", + "Laughing", "Joy", "Sweet", "Satisfied", "Innocent", "Wink", + "Ambivalent", "Expressionless", "Sad", "Slant", "Worried", "Kissing", + "KissingHeart", "Angry", "Naughty", "Furious", "Cry", "OpenMouth", + "Fearful", "Confused", "Weary", "Scream", "Astonished", "Flushed", + "Sleeping", "NoMouth", "Mask", "Worried", "Smile", "Muscle", + "Facepunch", "ThumbsUp", "ThumbsDown", "Beers", "Cocktail", "Burger", + "PoultryLeg", "Party", "Cake", "Sun", "Fire", "Heart" ]; var emojis_list = $.map(emojis, function (value, i) { @@ -95,7 +93,7 @@ use yii\helpers\Url; insert_tpl: "' />", tpl: "
  • '/>
    • ", data: emojis_list, - highlight_first: false, + highlight_first: true, limit: 100 });