v2.1.3

joypixels · Mar 26, 2016 · fff92f9 · fff92f9
1 parent a5317fd
commit fff92f9
Show file tree

Hide file tree

Showing 28 changed files with 81 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ When storing user inputted text in your database, say from a guestbook or throug
 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="//cdn.jsdelivr.net/emojione/2.1.2/lib/js/emojione.min.js"></script>
-<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/2.1.2/assets/css/emojione.min.css"/>
+<script src="//cdn.jsdelivr.net/emojione/2.1.3/lib/js/emojione.min.js"></script>
+<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/2.1.3/assets/css/emojione.min.css"/>
 ```
 
 Alternatively, CDNjs is also available as a [CDN Host for Emoji One](https://cdnjs.com/libraries/emojione).
@@ -62,19 +62,19 @@ Below there are some examples of how you will actually use the libraries to conv
 ### Javascript Conversion
 
 
-**[.toShort\(str\)](http://git.emojione.com/demos/2.1.2/jstoshort.html)** - _native unicode -> shortnames_
+**[.toShort\(str\)](http://git.emojione.com/demos/2.1.3/jstoshort.html)** - _native unicode -> shortnames_
 
 This demo shows you how to take native unicode emoji input, such as that from your mobile device, and translate it to their corresponding shortnames. (we recommend this for database storage)
 
-**[.shortnameToImage\(str\)](http://git.emojione.com/demos/2.1.2/jsshortnametoimage.html)** - _shortname -> images_
+**[.shortnameToImage\(str\)](http://git.emojione.com/demos/2.1.3/jsshortnametoimage.html)** - _shortname -> images_
 
 This demo shows you how to take input containing only shortnames and translate it directly to Emoji One images. (when displaying the unified input to clients)
 
-**[.unicodeToImage\(str\)](http://git.emojione.com/demos/2.1.2/jsunicodetoimage.html)** - _native unicode -> images_
+**[.unicodeToImage\(str\)](http://git.emojione.com/demos/2.1.3/jsunicodetoimage.html)** - _native unicode -> images_
 
 This demo shows you how to take native unicode emoji input, such as that from your mobile device, and translate it directly to Emoji One images. (would be great for a live editor preview)
 
-**[.toImage\(str\)](http://git.emojione.com/demos/2.1.2/jstoimage.html)** - _native unicode + shortnames -> images (mixed input)_
+**[.toImage\(str\)](http://git.emojione.com/demos/2.1.3/jstoimage.html)** - _native unicode + shortnames -> images (mixed input)_
 
 This demo shows you how to take input containing both native unicode emoji and shortnames, and translate it into Emoji One images for display.
 
@@ -83,19 +83,19 @@ This demo shows you how to take input containing both native unicode emoji and s
 
 ##### As of version 1.4.1 this library syntax has changed.
 
-**[toShort\($str\)](http://git.emojione.com/demos/2.1.2/phptoshort.php)** - _native unicode -> shortnames_
+**[toShort\($str\)](http://git.emojione.com/demos/2.1.3/phptoshort.php)** - _native unicode -> shortnames_
 
 This demo shows you how to take native unicode emoji input, such as that from your mobile device, and translate it to their corresponding shortnames. (we recommend this for database storage)
 
-**[shortnameToImage\($str\)](http://git.emojione.com/demos/2.1.2/phpshortnametoimage.php)** - _shortname -> images_
+**[shortnameToImage\($str\)](http://git.emojione.com/demos/2.1.3/phpshortnametoimage.php)** - _shortname -> images_
 
 This demo shows you how to take input containing only shortnames and translate it directly to Emoji One images. (when displaying the unified input to clients)
 
-**[unicodeToImage\($str\)](http://git.emojione.com/demos/2.1.2/phpunicodetoimage.php)** - _native unicode -> images_
+**[unicodeToImage\($str\)](http://git.emojione.com/demos/2.1.3/phpunicodetoimage.php)** - _native unicode -> images_
 
 This demo shows you how to take native unicode emoji input, such as that from your mobile device, and translate it directly to Emoji One images. (would be great for a live editor preview)
 
-**[toImage\($str\)](http://git.emojione.com/demos/2.1.2/phptoimage.php)** - _native unicode + shortnames -> images (mixed input)_
+**[toImage\($str\)](http://git.emojione.com/demos/2.1.3/phptoimage.php)** - _native unicode + shortnames -> images (mixed input)_
 
 This demo shows you how to take input containing both native unicode emoji and shortnames, and translate it into Emoji One images for display.
 
@@ -134,39 +134,39 @@ Or
 
 ### Extras
 
-**[shortnameToUnicode(str)](http://git.emojione.com/demos/2.1.2/shortnametounicode.html)**
+**[shortnameToUnicode(str)](http://git.emojione.com/demos/2.1.3/shortnametounicode.html)**
 
 Change from shortnames to native unicode emoji.
 
-**[Shortname Autocomplete](http://git.emojione.com/demos/2.1.2/autocomplete.html)**
+**[Shortname Autocomplete](http://git.emojione.com/demos/2.1.3/autocomplete.html)**
 
 Easily add shortname autocomplete functionality to any text input on your page.
 
-**[ASCII Smiley Conversion](http://git.emojione.com/demos/2.1.2/ascii-smileys.html)**
+**[ASCII Smiley Conversion](http://git.emojione.com/demos/2.1.3/ascii-smileys.html)**
 
 With one quick step you can start converting common ASCII smileys to their corresponding images.
 
-**[Alternate Alt Tags](http://git.emojione.com/demos/2.1.2/alternate-alt-tags.html)**
+**[Alternate Alt Tags](http://git.emojione.com/demos/2.1.3/alternate-alt-tags.html)**
 
 Change from the native unicode emoji in the resulting alt tags to their shortnames instead.
 
-**[Live Preview Box](http://git.emojione.com/demos/2.1.2/live-preview.html)**
+**[Live Preview Box](http://git.emojione.com/demos/2.1.3/live-preview.html)**
 
 Display converted Emoji in a preview box as the user is typing.
 
-**[Conversion HTML Class](http://git.emojione.com/demos/2.1.2/class-convert.html)**
+**[Conversion HTML Class](http://git.emojione.com/demos/2.1.3/class-convert.html)**
 
 Stick a class of .emojione-convert on any HTML element and automatically convert native unicode emoji and/or shortnames to images after page load.
 
-**[Convert on Form Submission](http://git.emojione.com/demos/2.1.2/convert-on-submit.html)**
+**[Convert on Form Submission](http://git.emojione.com/demos/2.1.3/convert-on-submit.html)**
 
 Converts unicode input to shortnames once the user submits the form.
 
-**[Sprites (PNG)](http://git.emojione.com/demos/2.1.2/sprites-png.html)**
+**[Sprites (PNG)](http://git.emojione.com/demos/2.1.3/sprites-png.html)**
 
 With an additional CSS file you can use Emoji One as resizable PNG sprites (up to 64x64).
 
-**[Sprites (SVG)](http://git.emojione.com/demos/2.1.2/sprites-svg.html)**
+**[Sprites (SVG)](http://git.emojione.com/demos/2.1.3/sprites-svg.html)**
 
 This sprite method requires no extra CSS, and is infinitely resizable.
 

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

diff --git a/demos/alternate-alt-tags.html b/demos/alternate-alt-tags.html
@@ -50,7 +50,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
     </div>
 </header>
 

diff --git a/demos/ascii-smileys.html b/demos/ascii-smileys.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
     </div>
 </header>
 

diff --git a/demos/autocomplete.html b/demos/autocomplete.html
@@ -102,7 +102,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
     </div>
 </header>
 

diff --git a/demos/class-convert.html b/demos/class-convert.html
@@ -54,7 +54,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/convert-on-submit.html b/demos/convert-on-submit.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/index.html b/demos/index.html
@@ -23,7 +23,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/jsshortnametoimage.html b/demos/jsshortnametoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/jstoimage.html b/demos/jstoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/jstoshort.html b/demos/jstoshort.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/jsunicodetoimage.html b/demos/jsunicodetoimage.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/live-preview.html b/demos/live-preview.html
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/phpshortnametoimage.php b/demos/phpshortnametoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/phptoimage.php b/demos/phptoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/phptoshort.php b/demos/phptoshort.php
@@ -50,7 +50,7 @@
 <!-- Masthead -->
 <header class="masthead">
     <div class="container">
-        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+        <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
     </div>
 </header>
 

diff --git a/demos/phpunicodetoimage.php b/demos/phpunicodetoimage.php
@@ -53,7 +53,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/shortnametounicode.html b/demos/shortnametounicode.html
@@ -32,7 +32,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/demos/sprites-png.html b/demos/sprites-png.html
@@ -65,7 +65,7 @@
   <!-- Masthead -->
   <header class="masthead">
     <div class="container">
-      <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+      <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
     </div>
   </header>
 

diff --git a/demos/sprites-svg.html b/demos/sprites-svg.html
@@ -69,7 +69,7 @@
 <!-- Masthead -->
 <header class="masthead">
   <div class="container">
-    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.2</span></span>
+    <h1 class="masthead-title">Emoji One Labs</h1><span class="version">version <span>2.1.3</span></span>
   </div>
 </header>
 

diff --git a/lib/js/emojione.min.js b/lib/js/emojione.min.js