bug fixes, gay pride flag added

joypixels · Jul 16, 2016 · 9c09b51 · 9c09b51
1 parent 514552b
commit 9c09b51
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 115 deletions.
diff --git a/assets/css/emojione-awesome.css b/assets/css/emojione-awesome.css
@@ -5421,12 +5421,6 @@
 .e1a-pancakes {
   background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/1f95e.svg"); }
 
-.e1a-asterisk_symbol {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/002a.svg"); }
-
-.e1a-pound_symbol {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0023.svg"); }
-
 .e1a-regional_indicator_z {
   background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/1f1ff.svg"); }
 
@@ -5504,33 +5498,3 @@
 
 .e1a-regional_indicator_a {
   background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/1f1e6.svg"); }
-
-.e1a-digit_nine {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0039.svg"); }
-
-.e1a-digit_eight {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0038.svg"); }
-
-.e1a-digit_seven {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0037.svg"); }
-
-.e1a-digit_six {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0036.svg"); }
-
-.e1a-digit_five {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0035.svg"); }
-
-.e1a-digit_four {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0034.svg"); }
-
-.e1a-digit_three {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0033.svg"); }
-
-.e1a-digit_two {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0032.svg"); }
-
-.e1a-digit_one {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0031.svg"); }
-
-.e1a-digit_zero {
-  background-image: url("//cdn.jsdelivr.net/emojione/assets/svg/0030.svg"); }
diff --git a/assets/png/1f3f3-1f308.png b/assets/png/1f3f3-1f308.png
diff --git a/assets/png/1f936.png b/assets/png/1f936.png
diff --git a/assets/png_128x128/1f3f3-1f308.png b/assets/png_128x128/1f3f3-1f308.png
diff --git a/assets/png_128x128/1f936.png b/assets/png_128x128/1f936.png
diff --git a/assets/png_512x512/1f3f3-1f308.png b/assets/png_512x512/1f3f3-1f308.png
diff --git a/assets/png_512x512/1f936.png b/assets/png_512x512/1f936.png
diff --git a/assets/sprites/emojione.sprites.css b/assets/sprites/emojione.sprites.css
diff --git a/assets/sprites/emojione.sprites.png b/assets/sprites/emojione.sprites.png
diff --git a/assets/sprites/emojione.sprites.svg b/assets/sprites/emojione.sprites.svg
diff --git a/assets/svg/1f3f3-1f308.svg b/assets/svg/1f3f3-1f308.svg
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "main": [
     "assets/css/emojione.css",
     "lib/js/emojione.js"

diff --git a/emoji.json b/emoji.json
diff --git a/emoji_strategy.json b/emoji_strategy.json
diff --git a/lib/android/com/emojione/Emojione.java b/lib/android/com/emojione/Emojione.java
@@ -1831,8 +1831,6 @@ public static String shortnameToUnicode(String input, boolean removeIfUnsupporte
         _shortNameToUnicode.put("peanuts", new String(new int[] {0x1f95c}, 0, 1));
         _shortNameToUnicode.put("kiwi", new String(new int[] {0x1f95d}, 0, 1));
         _shortNameToUnicode.put("pancakes", new String(new int[] {0x1f95e}, 0, 1));
-        _shortNameToUnicode.put("asterisk_symbol", new String(new int[] {0x002a}, 0, 1));
-        _shortNameToUnicode.put("pound_symbol", new String(new int[] {0x0023}, 0, 1));
         _shortNameToUnicode.put("regional_indicator_z", new String(new int[] {0x1f1ff}, 0, 1));
         _shortNameToUnicode.put("regional_indicator_y", new String(new int[] {0x1f1fe}, 0, 1));
         _shortNameToUnicode.put("regional_indicator_x", new String(new int[] {0x1f1fd}, 0, 1));
@@ -1859,16 +1857,6 @@ public static String shortnameToUnicode(String input, boolean removeIfUnsupporte
         _shortNameToUnicode.put("regional_indicator_c", new String(new int[] {0x1f1e8}, 0, 1));
         _shortNameToUnicode.put("regional_indicator_b", new String(new int[] {0x1f1e7}, 0, 1));
         _shortNameToUnicode.put("regional_indicator_a", new String(new int[] {0x1f1e6}, 0, 1));
-        _shortNameToUnicode.put("digit_nine", new String(new int[] {0x0039}, 0, 1));
-        _shortNameToUnicode.put("digit_eight", new String(new int[] {0x0038}, 0, 1));
-        _shortNameToUnicode.put("digit_seven", new String(new int[] {0x0037}, 0, 1));
-        _shortNameToUnicode.put("digit_six", new String(new int[] {0x0036}, 0, 1));
-        _shortNameToUnicode.put("digit_five", new String(new int[] {0x0035}, 0, 1));
-        _shortNameToUnicode.put("digit_four", new String(new int[] {0x0034}, 0, 1));
-        _shortNameToUnicode.put("digit_three", new String(new int[] {0x0033}, 0, 1));
-        _shortNameToUnicode.put("digit_two", new String(new int[] {0x0032}, 0, 1));
-        _shortNameToUnicode.put("digit_one", new String(new int[] {0x0031}, 0, 1));
-        _shortNameToUnicode.put("digit_zero", new String(new int[] {0x0030}, 0, 1));
     }
 
 }
diff --git a/lib/emojione-awesome/_emojione-awesome.map.scss b/lib/emojione-awesome/_emojione-awesome.map.scss
@@ -1793,8 +1793,6 @@ $emoji-map: (
 "1f95c": "peanuts",
 "1f95d": "kiwi",
 "1f95e": "pancakes",
-"002a": "asterisk_symbol",
-"0023": "pound_symbol",
 "1f1ff": "regional_indicator_z",
 "1f1fe": "regional_indicator_y",
 "1f1fd": "regional_indicator_x",
@@ -1820,15 +1818,5 @@ $emoji-map: (
 "1f1e9": "regional_indicator_d",
 "1f1e8": "regional_indicator_c",
 "1f1e7": "regional_indicator_b",
-"1f1e6": "regional_indicator_a",
-"0039": "digit_nine",
-"0038": "digit_eight",
-"0037": "digit_seven",
-"0036": "digit_six",
-"0035": "digit_five",
-"0034": "digit_four",
-"0033": "digit_three",
-"0032": "digit_two",
-"0031": "digit_one",
-"0030": "digit_zero"
+"1f1e6": "regional_indicator_a"
 );
diff --git a/lib/ios/src/Emojione.m b/lib/ios/src/Emojione.m
@@ -1850,8 +1850,6 @@ + (NSDictionary *)_loadShortNameToUnicode
         @"peanuts" : @"\U0001f95c",
         @"kiwi" : @"\U0001f95d",
         @"pancakes" : @"\U0001f95e",
-        @"asterisk_symbol" : @"\U0000002a",
-        @"pound_symbol" : @"#",
         @"regional_indicator_z" : @"\U0001f1ff",
         @"regional_indicator_y" : @"\U0001f1fe",
         @"regional_indicator_x" : @"\U0001f1fd",
@@ -1878,16 +1876,6 @@ + (NSDictionary *)_loadShortNameToUnicode
         @"regional_indicator_c" : @"\U0001f1e8",
         @"regional_indicator_b" : @"\U0001f1e7",
         @"regional_indicator_a" : @"\U0001f1e6",
-        @"digit_nine" : @"9",
-        @"digit_eight" : @"8",
-        @"digit_seven" : @"7",
-        @"digit_six" : @"6",
-        @"digit_five" : @"5",
-        @"digit_four" : @"4",
-        @"digit_three" : @"3",
-        @"digit_two" : @"2",
-        @"digit_one" : @"1",
-        @"digit_zero" : @"0",
             };
 }
 

diff --git a/lib/js/emojione.js b/lib/js/emojione.js
diff --git a/lib/js/emojione.min.js b/lib/js/emojione.min.js
diff --git a/lib/php/src/Ruleset.php b/lib/php/src/Ruleset.php
@@ -75,7 +75,6 @@ class Ruleset implements RulesetInterface
         ':goal:' => '1f945',
         ':goal_net:' => '1f945',
         ':leo:' => '264c',
-        ':asterisk_symbol:' => '002a',
         ':virgo:' => '264d',
         ':handball:' => '1f93e',
         ':libra:' => '264e',
@@ -390,6 +389,7 @@ class Ruleset implements RulesetInterface
         ':expecting_woman:' => '1f930',
         ':wind_chime:' => '1f390',
         ':face_palm:' => '1f926',
+        ':facepalm:' => '1f926',
         ':shrug:' => '1f937',
         ':rice_scene:' => '1f391',
         ':school_satchel:' => '1f392',
@@ -399,7 +399,6 @@ class Ruleset implements RulesetInterface
         ':roller_coaster:' => '1f3a2',
         ':fishing_pole_and_fish:' => '1f3a3',
         ':microphone:' => '1f3a4',
-        ':pound_symbol:' => '0023',
         ':movie_camera:' => '1f3a5',
         ':cinema:' => '1f3a6',
         ':headphones:' => '1f3a7',
@@ -683,6 +682,7 @@ class Ruleset implements RulesetInterface
         ':revolving_hearts:' => '1f49e',
         ':vhs:' => '1f4fc',
         ':face_palm_tone1:' => '1f926-1f3fb',
+        ':facepalm_tone1:' => '1f926-1f3fb',
         ':arrows_clockwise:' => '1f503',
         ':heart_decoration:' => '1f49f',
         ':loud_sound:' => '1f50a',
@@ -691,6 +691,7 @@ class Ruleset implements RulesetInterface
         ':electric_plug:' => '1f50c',
         ':mag:' => '1f50d',
         ':face_palm_tone2:' => '1f926-1f3fc',
+        ':facepalm_tone2:' => '1f926-1f3fc',
         ':bulb:' => '1f4a1',
         ':mag_right:' => '1f50e',
         ':lock_with_ink_pen:' => '1f50f',
@@ -705,13 +706,15 @@ class Ruleset implements RulesetInterface
         ':bookmark:' => '1f516',
         ':boom:' => '1f4a5',
         ':face_palm_tone3:' => '1f926-1f3fd',
+        ':facepalm_tone3:' => '1f926-1f3fd',
         ':link:' => '1f517',
         ':radio_button:' => '1f518',
         ':sweat_drops:' => '1f4a6',
         ':back:' => '1f519',
         ':end:' => '1f51a',
         ':droplet:' => '1f4a7',
         ':face_palm_tone4:' => '1f926-1f3fe',
+        ':facepalm_tone4:' => '1f926-1f3fe',
         ':on:' => '1f51b',
         ':soon:' => '1f51c',
         ':dash:' => '1f4a8',
@@ -727,6 +730,7 @@ class Ruleset implements RulesetInterface
         ':abcd:' => '1f521',
         ':dizzy:' => '1f4ab',
         ':face_palm_tone5:' => '1f926-1f3ff',
+        ':facepalm_tone5:' => '1f926-1f3ff',
         ':1234:' => '1f522',
         ':symbols:' => '1f523',
         ':speech_balloon:' => '1f4ac',
@@ -2378,17 +2382,7 @@ class Ruleset implements RulesetInterface
         ':regional_indicator_d:' => '1f1e9',
         ':regional_indicator_c:' => '1f1e8',
         ':regional_indicator_b:' => '1f1e7',
-        ':regional_indicator_a:' => '1f1e6',
-        ':digit_nine:' => '0039',
-        ':digit_eight:' => '0038',
-        ':digit_seven:' => '0037',
-        ':digit_six:' => '0036',
-        ':digit_five:' => '0035',
-        ':digit_four:' => '0034',
-        ':digit_three:' => '0033',
-        ':digit_two:' => '0032',
-        ':digit_one:' => '0031',
-        ':digit_zero:' => '0030'
+        ':regional_indicator_a:' => '1f1e6'
     );
 
     protected $ascii_replace = array(
@@ -2586,7 +2580,6 @@ class Ruleset implements RulesetInterface
         ':goal:' => "\xF0\x9F\xA5\x85",
         ':goal_net:' => "\xF0\x9F\xA5\x85",
         ':leo:' => "\xE2\x99\x8C\xEF\xB8\x8F",
-        ':asterisk_symbol:' => "\x2A",
         ':virgo:' => "\xE2\x99\x8D\xEF\xB8\x8F",
         ':handball:' => "\xF0\x9F\xA4\xBE",
         ':libra:' => "\xE2\x99\x8E\xEF\xB8\x8F",
@@ -2901,6 +2894,7 @@ class Ruleset implements RulesetInterface
         ':expecting_woman:' => "\xF0\x9F\xA4\xB0",
         ':wind_chime:' => "\xF0\x9F\x8E\x90",
         ':face_palm:' => "\xF0\x9F\xA4\xA6",
+        ':facepalm:' => "\xF0\x9F\xA4\xA6",
         ':shrug:' => "\xF0\x9F\xA4\xB7",
         ':rice_scene:' => "\xF0\x9F\x8E\x91",
         ':school_satchel:' => "\xF0\x9F\x8E\x92",
@@ -2910,7 +2904,6 @@ class Ruleset implements RulesetInterface
         ':roller_coaster:' => "\xF0\x9F\x8E\xA2",
         ':fishing_pole_and_fish:' => "\xF0\x9F\x8E\xA3",
         ':microphone:' => "\xF0\x9F\x8E\xA4",
-        ':pound_symbol:' => "\x23",
         ':movie_camera:' => "\xF0\x9F\x8E\xA5",
         ':cinema:' => "\xF0\x9F\x8E\xA6",
         ':headphones:' => "\xF0\x9F\x8E\xA7",
@@ -3194,6 +3187,7 @@ class Ruleset implements RulesetInterface
         ':revolving_hearts:' => "\xF0\x9F\x92\x9E",
         ':vhs:' => "\xF0\x9F\x93\xBC",
         ':face_palm_tone1:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBB",
+        ':facepalm_tone1:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBB",
         ':arrows_clockwise:' => "\xF0\x9F\x94\x83",
         ':heart_decoration:' => "\xF0\x9F\x92\x9F",
         ':loud_sound:' => "\xF0\x9F\x94\x8A",
@@ -3202,6 +3196,7 @@ class Ruleset implements RulesetInterface
         ':electric_plug:' => "\xF0\x9F\x94\x8C",
         ':mag:' => "\xF0\x9F\x94\x8D",
         ':face_palm_tone2:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBC",
+        ':facepalm_tone2:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBC",
         ':bulb:' => "\xF0\x9F\x92\xA1",
         ':mag_right:' => "\xF0\x9F\x94\x8E",
         ':lock_with_ink_pen:' => "\xF0\x9F\x94\x8F",
@@ -3216,13 +3211,15 @@ class Ruleset implements RulesetInterface
         ':bookmark:' => "\xF0\x9F\x94\x96",
         ':boom:' => "\xF0\x9F\x92\xA5",
         ':face_palm_tone3:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBD",
+        ':facepalm_tone3:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBD",
         ':link:' => "\xF0\x9F\x94\x97",
         ':radio_button:' => "\xF0\x9F\x94\x98",
         ':sweat_drops:' => "\xF0\x9F\x92\xA6",
         ':back:' => "\xF0\x9F\x94\x99",
         ':end:' => "\xF0\x9F\x94\x9A",
         ':droplet:' => "\xF0\x9F\x92\xA7",
         ':face_palm_tone4:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBE",
+        ':facepalm_tone4:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBE",
         ':on:' => "\xF0\x9F\x94\x9B",
         ':soon:' => "\xF0\x9F\x94\x9C",
         ':dash:' => "\xF0\x9F\x92\xA8",
@@ -3238,6 +3235,7 @@ class Ruleset implements RulesetInterface
         ':abcd:' => "\xF0\x9F\x94\xA1",
         ':dizzy:' => "\xF0\x9F\x92\xAB",
         ':face_palm_tone5:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBF",
+        ':facepalm_tone5:' => "\xF0\x9F\xA4\xA6\xF0\x9F\x8F\xBF",
         ':1234:' => "\xF0\x9F\x94\xA2",
         ':symbols:' => "\xF0\x9F\x94\xA3",
         ':speech_balloon:' => "\xF0\x9F\x92\xAC",
@@ -4889,17 +4887,7 @@ class Ruleset implements RulesetInterface
         ':regional_indicator_d:' => "\xF0\x9F\x87\xA9",
         ':regional_indicator_c:' => "\xF0\x9F\x87\xA8",
         ':regional_indicator_b:' => "\xF0\x9F\x87\xA7",
-        ':regional_indicator_a:' => "\xF0\x9F\x87\xA6",
-        ':digit_nine:' => "\x39",
-        ':digit_eight:' => "\x38",
-        ':digit_seven:' => "\x37",
-        ':digit_six:' => "\x36",
-        ':digit_five:' => "\x35",
-        ':digit_four:' => "\x34",
-        ':digit_three:' => "\x33",
-        ':digit_two:' => "\x32",
-        ':digit_one:' => "\x31",
-        ':digit_zero:' => "\x30"
+        ':regional_indicator_a:' => "\xF0\x9F\x87\xA6"
     );
 
     protected $asciiRegexp = '(\\<3|&lt;3|\\<\\/3|&lt;\\/3|\\:\'\\)|\\:\'\\-\\)|\\:D|\\:\\-D|\\=D|\\:\\)|\\:\\-\\)|\\=\\]|\\=\\)|\\:\\]|\'\\:\\)|\'\\:\\-\\)|\'\\=\\)|\'\\:D|\'\\:\\-D|\'\\=D|\\>\\:\\)|&gt;\\:\\)|\\>;\\)|&gt;;\\)|\\>\\:\\-\\)|&gt;\\:\\-\\)|\\>\\=\\)|&gt;\\=\\)|;\\)|;\\-\\)|\\*\\-\\)|\\*\\)|;\\-\\]|;\\]|;D|;\\^\\)|\'\\:\\(|\'\\:\\-\\(|\'\\=\\(|\\:\\*|\\:\\-\\*|\\=\\*|\\:\\^\\*|\\>\\:P|&gt;\\:P|X\\-P|x\\-p|\\>\\:\\[|&gt;\\:\\[|\\:\\-\\(|\\:\\(|\\:\\-\\[|\\:\\[|\\=\\(|\\>\\:\\(|&gt;\\:\\(|\\>\\:\\-\\(|&gt;\\:\\-\\(|\\:@|\\:\'\\(|\\:\'\\-\\(|;\\(|;\\-\\(|\\>\\.\\<|&gt;\\.&lt;|D\\:|\\:\\$|\\=\\$|#\\-\\)|#\\)|%\\-\\)|%\\)|X\\)|X\\-\\)|\\*\\\\0\\/\\*|\\\\0\\/|\\*\\\\O\\/\\*|\\\\O\\/|O\\:\\-\\)|0\\:\\-3|0\\:3|0\\:\\-\\)|0\\:\\)|0;\\^\\)|O\\:\\-\\)|O\\:\\)|O;\\-\\)|O\\=\\)|0;\\-\\)|O\\:\\-3|O\\:3|B\\-\\)|B\\)|8\\)|8\\-\\)|B\\-D|8\\-D|\\-_\\-|\\-__\\-|\\-___\\-|\\>\\:\\\\|&gt;\\:\\\\|\\>\\:\\/|&gt;\\:\\/|\\:\\-\\/|\\:\\-\\.|\\:\\/|\\:\\\\|\\=\\/|\\=\\\\|\\:L|\\=L|\\:P|\\:\\-P|\\=P|\\:\\-p|\\:p|\\=p|\\:\\-Þ|\\:\\-&THORN;|\\:Þ|\\:&THORN;|\\:þ|\\:&thorn;|\\:\\-þ|\\:\\-&thorn;|\\:\\-b|\\:b|d\\:|\\:\\-O|\\:O|\\:\\-o|\\:o|O_O|\\>\\:O|&gt;\\:O|\\:\\-X|\\:X|\\:\\-#|\\:#|\\=X|\\=x|\\:x|\\:\\-x|\\=#)';

diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'emojione:emojione',
   summary: 'Meteor Package of http://www.emojione.com/ set',
-  version: '2.2.5',
+  version: '2.2.6',
   git: 'https://github.com/Ranks/emojione.git'
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images.",
   "author": "Emoji One <[email protected]> (http://emojione.com)",
   "main": "lib/js/emojione.js",