3.1.4 release

joypixels · Apr 27, 2018 · eb9741a · eb9741a
1 parent 2c5d650
commit eb9741a
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 29 deletions.
diff --git a/.versions b/.versions
@@ -1,34 +1,37 @@
-babel-compiler@6.19.4
-babel-runtime@1.0.1
+babel-compiler@7.0.7
+babel-runtime@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-check@1.2.5
+check@1.3.0
 [email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-emojione:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+emojione:[email protected]
 [email protected]
 [email protected]
-[email protected]
+[email protected]
+[email protected]
 [email protected]
-meteor@1.7.0
-modules@0.9.2
-modules-runtime@0.8.0
+meteor@1.8.2
+modules@0.11.3
+modules-runtime@0.9.1
 [email protected]
 [email protected]
-promise@0.8.9
-random@1.0.10
+promise@0.10.1
+random@1.1.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]_1
 [email protected]
 [email protected]
 [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].3/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].3/extras/css/emojione.min.css"/>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].4/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].4/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.3",
+  "version": "3.1.4",
   "main": [
     "extras/css/emojione.css",
     "lib/js/emojione.js"

diff --git a/extras/fonts/README.md b/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.3/emojione-android.ttf)
+### Google Font - [emojione-android.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/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.3/emojione-apple.ttf)
+**For older apple devices** - [emojione-apple.ttf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-apple.ttf)
 
-**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.3/emojione-apple.ttc)
+**For latest apple devices** - [emojione-apple.ttc](https://github.com/emojione/emojione-assets/releases/download/3.1.4/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.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)
+  * Open Type Font: [emojione-svg.otf](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.otf)
+  * Web Open Font Format: [emojione-svg.woff](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.woff)
+  * Web Open Font Format 2.0: [emojione-svg.woff2](https://github.com/emojione/emojione-assets/releases/download/3.1.4/emojione-svg.woff2)
 
 The black and white images used to generate these fonts are also provided in the v2 branch here:
 

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
@@ -466,7 +466,7 @@ public function unicodeToImageCallback($m)
             }
             else
             {
-                $unicode;
+                return $unicode;
             }
 
             $filename = $shortcode_replace[$shortname][2];

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.3',
+  version: '3.1.4',
   git: 'https://github.com/emojione/emojione.git'
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emojione",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -466,7 +466,7 @@ public function unicodeToImageCallback($m) @@
                 }
                 else
                 {
-                    $unicode;
+                    return $unicode;
                 }
                 $filename = $shortcode_replace[$shortname][2];
@@ Expand Down @@