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

Commit 2c5d650

Browse files
committed
3.1.3 release
1 parent d56ef20 commit 2c5d650

File tree

11 files changed

+123
-112
lines changed

11 files changed

+123
-112
lines changed

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/[email protected].2/lib/js/emojione.min.js"></script>
7-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/extras/css/emojione.min.css"/>
6+
<script src="https://cdn.jsdelivr.net/npm/[email protected].3/lib/js/emojione.min.js"></script>
7+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/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.

UPGRADE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- emojiVersion (str)
1313
- emojiSize (str)
1414
- greedyMatch (bool)
15+
- blacklistChars (bool)
1516
- spriteSize (str)
1617
- riskyMatchAscii (bool)
1718

@@ -23,6 +24,7 @@
2324
- emojiVersion (str)
2425
- emojiSize (str)
2526
- greedyMatch (bool)
27+
- blacklistChars (str)
2628
- spriteSize (str)
2729
- riskyMatchAscii (bool)
2830
- Tests

USAGE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Both PHP and JavaScript libraries now have wider range of available properties.
88
- `emojiSize` (str) **Default: `32`** - Used only to direct CDN path for non-sprite PNG usage. Available options are '32', '64', and '128'.
99
- `imagePathPNG` (str) - Defaults to CDN (jsdelivr) path. Setting as alternate path overwrites `emojiSize` option.
1010
- `greedyMatch` (bool) **Default: `false`** - When `true`, matches non-fully-qualified Unicode values.
11+
- `blacklistChars` (str) **Default: `''`** - Comma-separated list of characters that should not be replaced. For example, setting to `'#,*'` ensures pound and asterisk symbols are not replaced.
1112
- `imageTitleTag` (bool) **Default: `true`** - When `false`, removes title attribute from <img> tag.
1213
- `sprites` (bool) **Default: `false`** - When `true`, sprite markup will be used. Sprite CSS and PNG assets must be additionally included.
1314
- `spriteSize` (str) **Default `32`** - Alternate size is `64`.

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.2",
3+
"version": "3.1.3",
44
"main": [
55
"extras/css/emojione.css",
66
"lib/js/emojione.js"

extras/fonts/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ There's no better way to port our emoji into your device than through a native f
55
> Note: Due to their size, the font files have been removed from this repo and instead will be attached to releases on our repo that hosts the artwork and related assets, [emojione-assets](https://github.com/emojione/emojione-assets).
66
>
77
> Please go here to download the font files: [emojione-assets/releases](https://github.com/emojione/emojione-assets/releases)
8-
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-android.ttf)
8+
### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-android.ttf)
99

1010
* Compatible with rooted Android devices and Linux.
1111
* Updated July 6, 2017
@@ -27,9 +27,9 @@ Linux Setup Help:
2727

2828
### Apple Font
2929

30-
**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-apple.ttf)
30+
**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-apple.ttf)
3131

32-
**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-apple.ttc)
32+
**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-apple.ttc)
3333

3434
* Compatible with Mac OSX, and iOS devices (iPhone, iPad).
3535
* Rename font to Apple Color Emoji.ttf for Mac OSX.
@@ -46,9 +46,9 @@ Search for “EmojiOne 2016” on Cydia and apply with BytaFont. Cydia is a soft
4646
### EmojiOne SVG-based Color Fonts
4747
Through a cooperative effort with Adobe Systems, EmojiOne created black and white versions of the emoji set which were used, in part, to generate this font. Using these fonts with Firefox or Microsoft Edge, you can enjoy full-color EmojiOne emoji. Black and white images will show as the fall back for systems that are not able to render color SVG fonts. The font is available in the following formats:
4848

49-
* Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.otf)
50-
* Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.woff)
51-
* Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.woff2)
49+
* Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.otf)
50+
* Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.woff)
51+
* Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.woff2)
5252

5353
The black and white images used to generate these fonts are also provided in the v2 branch here:
5454

lib/js/emojione.js

Lines changed: 5 additions & 3 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: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)