Skip to content
This repository was archived by the owner on Jul 23, 2019. It is now read-only.

Commit 85ee3ed

Browse files
committed
3.1.7 bugfixes
1 parent 147c407 commit 85ee3ed

File tree

9 files changed

+43
-63
lines changed

9 files changed

+43
-63
lines changed

.versions

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1-
babel-compiler@7.0.7
2-
babel-runtime@1.2.0
3-
base64@1.0.10
1+
babel-compiler@7.1.1
2+
babel-runtime@1.2.2
3+
base64@1.0.11
44
blaze@2.1.8
55
blaze-tools@1.0.10
6-
caching-compiler@1.1.9
6+
caching-compiler@1.1.12
77
caching-html-compiler@1.0.6
8-
check@1.3.0
8+
check@1.3.1
99
deps@1.0.12
1010
diff-sequence@1.1.0
11-
dynamic-import@0.3.0
12-
ecmascript@0.10.6
13-
ecmascript-runtime@0.5.0
14-
ecmascript-runtime-client@0.6.0
15-
ecmascript-runtime-server@0.5.0
11+
dynamic-import@0.4.0
12+
ecmascript@0.11.1
13+
ecmascript-runtime@0.7.0
14+
ecmascript-runtime-client@0.7.1
15+
ecmascript-runtime-server@0.7.0
1616
ejson@1.1.0
17-
emojione:emojione@3.1.6
17+
emojione:emojione@3.1.7
1818
html-tools@1.0.11
1919
htmljs@1.0.11
2020
http@1.4.1
2121
id-map@1.1.0
2222
jquery@1.11.10
23-
meteor@1.8.2
24-
modules@0.11.3
25-
modules-runtime@0.9.1
26-
mongo-id@1.0.6
23+
meteor@1.9.0
24+
modern-browsers@0.1.1
25+
modules@0.12.0
26+
modules-runtime@0.10.0
27+
mongo-id@1.0.7
2728
observe-sequence@1.0.16
28-
promise@0.10.1
29+
promise@0.11.1
2930
random@1.1.0
3031
reactive-var@1.0.11
3132
spacebars@1.0.12
3233
spacebars-compiler@1.1.0
3334
templating@1.1.12_1
3435
templating-tools@1.1.1
35-
tracker@1.1.3
36+
tracker@1.2.0
3637
underscore@1.0.10
3738
url@1.2.0

INSTALLATION.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
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:
44

55
```
6-
<script src="https://cdn.jsdelivr.net/npm/emojione@3.1.6/lib/js/emojione.min.js"></script>
7-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.6/extras/css/emojione.min.css"/>
6+
<script src="https://cdn.jsdelivr.net/npm/emojione@3.1.7/lib/js/emojione.min.js"></script>
7+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emojione@3.1.7/extras/css/emojione.min.css"/>
88
```
99

1010
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.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emojione",
3-
"version": "3.1.6",
3+
"version": "3.1.7",
44
"main": [
55
"extras/css/emojione.css",
66
"lib/js/emojione.js"

lib/js/emojione.js

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/js/emojione.min.js

Lines changed: 10 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/php/src/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public function unicodeToImageCallback($m)
452452
$unicode_replace = $ruleset->getUnicodeReplace();
453453
$unicode_replace_greedy = $ruleset->getUnicodeReplaceGreedy();
454454

455-
$unicode = strtoupper($m[0]);
455+
$unicode = $m[0];
456456

457457
$bList = explode(',', $this->blacklistChars);
458458

lib/php/src/Ruleset.php

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7323,25 +7323,15 @@ class Ruleset implements RulesetInterface
73237323
"\x2A\xE2\x83\xA3" => ":asterisk:",
73247324
"\x2A\xEF\xB8\x8F" => ":asterisk_symbol:",
73257325
"\x30\xE2\x83\xA3" => ":zero:",
7326-
"\x30\xEF\xB8\x8F" => ":digit_zero:",
73277326
"\x31\xE2\x83\xA3" => ":one:",
7328-
"\x31\xEF\xB8\x8F" => ":digit_one:",
73297327
"\x32\xE2\x83\xA3" => ":two:",
7330-
"\x32\xEF\xB8\x8F" => ":digit_two:",
73317328
"\x33\xE2\x83\xA3" => ":three:",
7332-
"\x33\xEF\xB8\x8F" => ":digit_three:",
73337329
"\x34\xE2\x83\xA3" => ":four:",
7334-
"\x34\xEF\xB8\x8F" => ":digit_four:",
73357330
"\x35\xE2\x83\xA3" => ":five:",
7336-
"\x35\xEF\xB8\x8F" => ":digit_five:",
73377331
"\x36\xE2\x83\xA3" => ":six:",
7338-
"\x36\xEF\xB8\x8F" => ":digit_six:",
73397332
"\x37\xE2\x83\xA3" => ":seven:",
7340-
"\x37\xEF\xB8\x8F" => ":digit_seven:",
73417333
"\x38\xE2\x83\xA3" => ":eight:",
7342-
"\x38\xEF\xB8\x8F" => ":digit_eight:",
73437334
"\x39\xE2\x83\xA3" => ":nine:",
7344-
"\x39\xEF\xB8\x8F" => ":digit_nine:",
73457335
"\xF0\x9F\x80\x84" => ":mahjong:",
73467336
"\xF0\x9F\x83\x8F" => ":black_joker:",
73477337
"\xF0\x9F\x85\xB0" => ":a:",
@@ -8458,19 +8448,7 @@ class Ruleset implements RulesetInterface
84588448
"\xE2\xAD\x95" => ":o:",
84598449
"\xE3\x80\xBD" => ":part_alternation_mark:",
84608450
"\xE3\x8A\x97" => ":congratulations:",
8461-
"\xE3\x8A\x99" => ":secret:",
8462-
"\x23" => ":pound_symbol:",
8463-
"\x2A" => ":asterisk_symbol:",
8464-
"\x30" => ":digit_zero:",
8465-
"\x31" => ":digit_one:",
8466-
"\x32" => ":digit_two:",
8467-
"\x33" => ":digit_three:",
8468-
"\x34" => ":digit_four:",
8469-
"\x35" => ":digit_five:",
8470-
"\x36" => ":digit_six:",
8471-
"\x37" => ":digit_seven:",
8472-
"\x38" => ":digit_eight:",
8473-
"\x39" => ":digit_nine:"
8451+
"\xE3\x8A\x99" => ":secret:"
84748452
);
84758453

84768454
protected $unicode_replace_greedy = array(

package.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package.describe({
22
name: 'emojione:emojione',
33
summary: 'Meteor Package of the https://www.emojione.com/ set.',
4-
version: '3.1.6',
4+
version: '3.1.7',
55
git: 'https://github.com/emojione/emojione.git'
66
});
77

@@ -11,13 +11,13 @@ Package.onUse(function(api) {
1111
api.addFiles([
1212
'lib/meteor/pre-export.js',
1313
'lib/js/emojione.js',
14-
'lib/meteor/post-export.js',
14+
'lib/meteor/post-export.js'
1515
]);
1616

1717
api.use([
1818
'blaze',
1919
'htmljs',
20-
'templating',
20+
'templating'
2121
], 'client');
2222

2323
api.addFiles([

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emojione",
3-
"version": "3.1.6",
3+
"version": "3.1.7",
44
"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.",
55
"author": "EmojiOne <ryan@emojione.com> (http://emojione.com)",
66
"main": "lib/js/emojione.js",

0 commit comments

Comments
 (0)