3.1.3 release

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

UPGRADE.md

@@ -12,6 +12,7 @@
   	- emojiVersion (str)
 	- emojiSize (str)
   	- greedyMatch (bool)
+  	- blacklistChars (bool)
 	- spriteSize (str)
 	- riskyMatchAscii (bool)
 
@@ -23,6 +24,7 @@
  	- emojiVersion (str)
 	- emojiSize (str)
 	- greedyMatch (bool)
+	- blacklistChars (str)
 	- spriteSize (str)
 	- riskyMatchAscii (bool)
  - Tests

USAGE.md

@@ -8,6 +8,7 @@ Both PHP and JavaScript libraries now have wider range of available properties.
  - `emojiSize` (str) **Default: `32`** - Used only to direct CDN path for non-sprite PNG usage. Available options are '32', '64', and '128'.
  - `imagePathPNG` (str) - Defaults to CDN (jsdelivr) path. Setting as alternate path overwrites `emojiSize` option.
  - `greedyMatch` (bool) **Default: `false`** - When `true`, matches non-fully-qualified Unicode values.
+ - `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.
  - `imageTitleTag` (bool) **Default: `true`** - When `false`, removes title attribute from <img> tag.
  - `sprites` (bool) **Default: `false`** - When `true`, sprite markup will be used. Sprite CSS and PNG assets must be additionally included.
  - `spriteSize` (str) **Default `32`** - Alternate size is `64`.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": [
     "extras/css/emojione.css",
     "lib/js/emojione.js"

extras/fonts/README.md

@@ -5,7 +5,7 @@ There's no better way to port our emoji into your device than through a native f
 > 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).
 >
 > Please go here to download the font files: [emojione-assets/releases](https://github.com/emojione/emojione-assets/releases)
-### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-android.ttf)
+### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-android.ttf)
 
   * Compatible with rooted Android devices and Linux.
   * Updated July 6, 2017
@@ -27,9 +27,9 @@ Linux Setup Help:
 
 ### Apple Font
 
-**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-apple.ttf)
+**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-apple.ttf)
 
-**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-apple.ttc)
+**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-apple.ttc)
 
   * Compatible with Mac OSX, and iOS devices (iPhone, iPad).
   * 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
 ### EmojiOne SVG-based Color Fonts
 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:
 
-  * Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.otf)
-  * Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.woff)
-  * Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.2/emojione-svg.woff2)
+  * Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.otf)
+  * Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.woff)
+  * Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-svg.woff2)
 
 The black and white images used to generate these fonts are also provided in the v2 branch here: