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

Commit

Permalink
update version to 1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
emitxyz committed Oct 6, 2014
1 parent 88f0d2b commit f316a8a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ When storing user inputted text in your database, say from a guestbook or throug
We've teamed up with [JSDelivr](http://jsdelivr.com) 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/1.2.3/lib/js/emojione.min.js" type="text/javascript"></script>
<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.2.3/assets/css/emojione.min.css" type="text/css" media="all" />
<script src="//cdn.jsdelivr.net/emojione/1.2.4/lib/js/emojione.min.js" type="text/javascript"></script>
<link rel="stylesheet" href="//cdn.jsdelivr.net/emojione/1.2.4/assets/css/emojione.min.css" type="text/css" media="all" />
```

Quick installs can also be done using NPM and Bower (for the Javascript toolkit) or Composer (for the PHP toolkit).
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": "1.2.3",
"version": "1.2.4",
"main:": [
"assets/css/emojione.css",
"lib/js/emojione.js"
Expand Down
2 changes: 1 addition & 1 deletion lib/js/emojione.js
Original file line number Diff line number Diff line change
Expand Up @@ -3773,7 +3773,7 @@
ns.sprites = false; // if this is true then sprite markup will be used (if SVG image type is set then you must include the SVG sprite file locally)
ns.unicodeAlt = true; // use the unicode char as the alt attribute (makes copy and pasting the resulting text better)
ns.ascii = false; // change to true to convert ascii smileys
ns.cacheBustParam = '?v=1.2.3'; // you can [optionally] modify this to force browsers to refresh their cache. it will be appended to the send of the filenames
ns.cacheBustParam = '?v=1.2.4'; // you can [optionally] modify this to force browsers to refresh their cache. it will be appended to the send of the filenames

ns.toImage = function(str) {
str = ns.unicodeToImage(str);
Expand Down
2 changes: 1 addition & 1 deletion lib/js/emojione.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/php/src/Emojione.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Emojione {
static $ascii = false; // convert ascii smileys?
static $unicodeAlt = true; // use the unicode char as the alt attribute (makes copy and pasting the resulting text better)
static $imageType = 'png';
static $cacheBustParam = '?v=1.2.3';
static $cacheBustParam = '?v=1.2.4';
static $sprites = false;
static $imagePathPNG = '//cdn.jsdelivr.net/emojione/assets/png/';
static $imagePathSVG = '//cdn.jsdelivr.net/emojione/assets/svg/';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emojione",
"version": "1.2.3",
"version": "1.2.4",
"description": "Emoji One 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 and SVG formats provided for the emoji images.",
"author": "Emoji One <ryan@emojione.com> (http://emojione.com)",
"main": "lib/js/emojione.js",
Expand Down

0 comments on commit f316a8a

Please sign in to comment.