3.1.7 bugfixes

joypixels · Jul 11, 2018 · 85ee3ed · 85ee3ed
1 parent 147c407
commit 85ee3ed
Showing 9 changed files with 43 additions and 63 deletions.
diff --git a/.versions b/.versions
@@ -1,37 +1,38 @@
-babel-compiler@7.0.7
-[email protected].0
-[email protected].10
+babel-compiler@7.1.1
+[email protected].2
+[email protected].11
 [email protected]
 [email protected]
-[email protected].9
+[email protected].12
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
-dynamic-import@0.3.0
-ecmascript@0.10.6
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.6.0
-ecmascript-runtime-server@0.5.0
+dynamic-import@0.4.0
+ecmascript@0.11.1
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.7.1
+ecmascript-runtime-server@0.7.0
 [email protected]
-emojione:[email protected].6
+emojione:[email protected].7
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
-promise@0.10.1
+promise@0.11.1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]_1
 [email protected]
-tracker@1.1.3
+tracker@1.2.0
 [email protected]
 [email protected]
diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -3,8 +3,8 @@
 We've teamed up with [JSDelivr](http://www.jsdelivr.com/#!emojione) to provide a simple way to install these emoji on any javascript-enabled website. Add the following script and stylesheet links to the head of your webpage:
 
 ```
-<script src="https://cdn.jsdelivr.net/npm/[email protected].6/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].6/extras/css/emojione.min.css"/>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].7/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].7/extras/css/emojione.min.css"/>
 ```
 
 Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit). **If you wish to serve image assets locally you'll need to install [emojione-assets](https://www.github.com/emojione/emojione-assets) and include the pngs and/or sprites into your project.** Many of our [demos](https://demos.emojione.com/latest/) use assets locally simply by pointing the `imagePathPNG` variable to your local asset location.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "main": [
     "extras/css/emojione.css",
     "lib/js/emojione.js"

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/Client.php b/lib/php/src/Client.php
@@ -452,7 +452,7 @@ public function unicodeToImageCallback($m)
             $unicode_replace = $ruleset->getUnicodeReplace();
             $unicode_replace_greedy = $ruleset->getUnicodeReplaceGreedy();
 
-            $unicode = strtoupper($m[0]);
+            $unicode = $m[0];
 
             $bList = explode(',', $this->blacklistChars);
 

diff --git a/lib/php/src/Ruleset.php b/lib/php/src/Ruleset.php
@@ -7323,25 +7323,15 @@ class Ruleset implements RulesetInterface
         "\x2A\xE2\x83\xA3" => ":asterisk:",
         "\x2A\xEF\xB8\x8F" => ":asterisk_symbol:",
         "\x30\xE2\x83\xA3" => ":zero:",
-        "\x30\xEF\xB8\x8F" => ":digit_zero:",
         "\x31\xE2\x83\xA3" => ":one:",
-        "\x31\xEF\xB8\x8F" => ":digit_one:",
         "\x32\xE2\x83\xA3" => ":two:",
-        "\x32\xEF\xB8\x8F" => ":digit_two:",
         "\x33\xE2\x83\xA3" => ":three:",
-        "\x33\xEF\xB8\x8F" => ":digit_three:",
         "\x34\xE2\x83\xA3" => ":four:",
-        "\x34\xEF\xB8\x8F" => ":digit_four:",
         "\x35\xE2\x83\xA3" => ":five:",
-        "\x35\xEF\xB8\x8F" => ":digit_five:",
         "\x36\xE2\x83\xA3" => ":six:",
-        "\x36\xEF\xB8\x8F" => ":digit_six:",
         "\x37\xE2\x83\xA3" => ":seven:",
-        "\x37\xEF\xB8\x8F" => ":digit_seven:",
         "\x38\xE2\x83\xA3" => ":eight:",
-        "\x38\xEF\xB8\x8F" => ":digit_eight:",
         "\x39\xE2\x83\xA3" => ":nine:",
-        "\x39\xEF\xB8\x8F" => ":digit_nine:",
         "\xF0\x9F\x80\x84" => ":mahjong:",
         "\xF0\x9F\x83\x8F" => ":black_joker:",
         "\xF0\x9F\x85\xB0" => ":a:",
@@ -8458,19 +8448,7 @@ class Ruleset implements RulesetInterface
         "\xE2\xAD\x95" => ":o:",
         "\xE3\x80\xBD" => ":part_alternation_mark:",
         "\xE3\x8A\x97" => ":congratulations:",
-        "\xE3\x8A\x99" => ":secret:",
-        "\x23" => ":pound_symbol:",
-        "\x2A" => ":asterisk_symbol:",
-        "\x30" => ":digit_zero:",
-        "\x31" => ":digit_one:",
-        "\x32" => ":digit_two:",
-        "\x33" => ":digit_three:",
-        "\x34" => ":digit_four:",
-        "\x35" => ":digit_five:",
-        "\x36" => ":digit_six:",
-        "\x37" => ":digit_seven:",
-        "\x38" => ":digit_eight:",
-        "\x39" => ":digit_nine:"
+        "\xE3\x8A\x99" => ":secret:"
     );
 
     protected $unicode_replace_greedy = array(

diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'emojione:emojione',
   summary: 'Meteor Package of the https://www.emojione.com/ set.',
-  version: '3.1.6',
+  version: '3.1.7',
   git: 'https://github.com/emojione/emojione.git'
 });
 
@@ -11,13 +11,13 @@ Package.onUse(function(api) {
   api.addFiles([
     'lib/meteor/pre-export.js',
     'lib/js/emojione.js',
-    'lib/meteor/post-export.js',
+    'lib/meteor/post-export.js'
   ]);
 
   api.use([
     'blaze',
     'htmljs',
-    'templating',
+    'templating'
   ], 'client');
 
   api.addFiles([

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "EmojiOne 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 formats provided for the emoji images.",
   "author": "EmojiOne <[email protected]> (http://emojione.com)",
   "main": "lib/js/emojione.js",