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

Commit

Permalink
uc9 update
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyahenson committed Jun 22, 2016
1 parent 8058e20 commit b02ceb1
Show file tree
Hide file tree
Showing 22 changed files with 43 additions and 43 deletions.
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.3/lib/js/emojione.min.js"></script>
<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/2.2.3/assets/css/emojione.min.css"/>
<script src="//cdn.jsdelivr.net/emojione/2.2.4/lib/js/emojione.min.js"></script>
<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/2.2.4/assets/css/emojione.min.css"/>
```

Alternatively, CDNjs is also available as a [CDN Host for Emoji One](https://cdnjs.com/libraries/emojione).
Expand Down Expand Up @@ -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.2.3/jstoshort.html)** - _native unicode -> shortnames_
**[.toShort\(str\)](http://git.emojione.com/demos/2.2.4/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.2.3/jsshortnametoimage.html)** - _shortname -> images_
**[.shortnameToImage\(str\)](http://git.emojione.com/demos/2.2.4/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.2.3/jsunicodetoimage.html)** - _native unicode -> images_
**[.unicodeToImage\(str\)](http://git.emojione.com/demos/2.2.4/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.2.3/jstoimage.html)** - _native unicode + shortnames -> images (mixed input)_
**[.toImage\(str\)](http://git.emojione.com/demos/2.2.4/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.

Expand All @@ -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.2.3/phptoshort.php)** - _native unicode -> shortnames_
**[toShort\($str\)](http://git.emojione.com/demos/2.2.4/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.2.3/phpshortnametoimage.php)** - _shortname -> images_
**[shortnameToImage\($str\)](http://git.emojione.com/demos/2.2.4/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.2.3/phpunicodetoimage.php)** - _native unicode -> images_
**[unicodeToImage\($str\)](http://git.emojione.com/demos/2.2.4/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.2.3/phptoimage.php)** - _native unicode + shortnames -> images (mixed input)_
**[toImage\($str\)](http://git.emojione.com/demos/2.2.4/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.

Expand Down Expand Up @@ -134,39 +134,39 @@ Or

### Extras

**[shortnameToUnicode(str)](http://git.emojione.com/demos/2.2.3/shortnametounicode.html)**
**[shortnameToUnicode(str)](http://git.emojione.com/demos/2.2.4/shortnametounicode.html)**

Change from shortnames to native unicode emoji.

**[Shortname Autocomplete](http://git.emojione.com/demos/2.2.3/autocomplete.html)**
**[Shortname Autocomplete](http://git.emojione.com/demos/2.2.4/autocomplete.html)**

Easily add shortname autocomplete functionality to any text input on your page.

**[ASCII Smiley Conversion](http://git.emojione.com/demos/2.2.3/ascii-smileys.html)**
**[ASCII Smiley Conversion](http://git.emojione.com/demos/2.2.4/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.2.3/alternate-alt-tags.html)**
**[Alternate Alt Tags](http://git.emojione.com/demos/2.2.4/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.2.3/live-preview.html)**
**[Live Preview Box](http://git.emojione.com/demos/2.2.4/live-preview.html)**

Display converted Emoji in a preview box as the user is typing.

**[Conversion HTML Class](http://git.emojione.com/demos/2.2.3/class-convert.html)**
**[Conversion HTML Class](http://git.emojione.com/demos/2.2.4/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.2.3/convert-on-submit.html)**
**[Convert on Form Submission](http://git.emojione.com/demos/2.2.4/convert-on-submit.html)**

Converts unicode input to shortnames once the user submits the form.

**[Sprites (PNG)](http://git.emojione.com/demos/2.2.3/sprites-png.html)**
**[Sprites (PNG)](http://git.emojione.com/demos/2.2.4/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.2.3/sprites-svg.html)**
**[Sprites (SVG)](http://git.emojione.com/demos/2.2.4/sprites-svg.html)**

This sprite method requires no extra CSS, and is infinitely resizable.

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emojione",
"version": "2.2.3",
"version": "2.2.4",
"main": [
"assets/css/emojione.css",
"lib/js/emojione.js"
Expand Down
2 changes: 1 addition & 1 deletion demos/alternate-alt-tags.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
4 changes: 2 additions & 2 deletions demos/ascii-smileys.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="./../assets/css/emojione.min.css" type="text/css" media="all" />

<!-- jQuery: -->
<script src="//cdn.jsdelivr.net/jquery/2.2.3/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/jquery/2.2.4/jquery.min.js"></script>

<!-- Demos Stylesheet: -->
<link rel="stylesheet" href="styles/demos.css"/>
Expand Down Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/autocomplete.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
4 changes: 2 additions & 2 deletions demos/class-convert.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="./../assets/css/emojione.min.css" type="text/css" media="all" />

<!-- jQuery: -->
<script src="//cdn.jsdelivr.net/jquery/2.2.3/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/jquery/2.2.4/jquery.min.js"></script>

<!-- Demos Stylesheet: -->
<link rel="stylesheet" href="styles/demos.css"/>
Expand Down Expand Up @@ -54,7 +54,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/convert-on-submit.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/jsshortnametoimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/jstoimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/jstoshort.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/jsunicodetoimage.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
4 changes: 2 additions & 2 deletions demos/live-preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="./../assets/css/emojione.min.css" type="text/css" media="all" />

<!-- jQuery: -->
<script src="//cdn.jsdelivr.net/jquery/2.2.3/jquery.min.js"></script>
<script src="//cdn.jsdelivr.net/jquery/2.2.4/jquery.min.js"></script>

<!-- Demos Stylesheet: -->
<link rel="stylesheet" href="styles/demos.css"/>
Expand Down Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/phpshortnametoimage.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/phptoimage.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/phptoshort.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/phpunicodetoimage.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/shortnametounicode.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/sprites-png.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion demos/sprites-svg.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<!-- Masthead -->
<header class="masthead">
<div class="container">
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.3</span></span>
<h1 class="masthead-title">EmojiOne Labs</h1><span class="version">version <span>2.2.4</span></span>
</div>
</header>

Expand Down
2 changes: 1 addition & 1 deletion lib/js/emojione.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/emojione.min.js

Large diffs are not rendered by default.

0 comments on commit b02ceb1

Please sign in to comment.