Skip to content

Commit

Permalink
6.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
caseyahenson committed Feb 23, 2021
1 parent b1b4ef9 commit 3a13f4d
Show file tree
Hide file tree
Showing 24 changed files with 17,100 additions and 13,448 deletions.
28 changes: 14 additions & 14 deletions .versions
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
babel-compiler@7.3.4
babel-runtime@1.3.0
base64@1.0.11
babel-compiler@7.5.3
babel-runtime@1.5.0
base64@1.0.12
blaze@2.1.8
blaze-tools@1.0.10
caching-compiler@1.2.1
caching-compiler@1.2.2
caching-html-compiler@1.0.6
check@1.3.1
deps@1.0.12
diff-sequence@1.1.1
dynamic-import@0.5.1
ecmascript@0.12.4
dynamic-import@0.5.2
ecmascript@0.14.3
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
ejson@1.1.0
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
ejson@1.1.1
fetch@0.1.1
html-tools@1.0.11
htmljs@1.0.11
id-map@1.1.0
inter-process-messaging@0.1.0
inter-process-messaging@0.1.1
joypixels:emoji-toolkit@6.0.1
jquery@1.11.10
meteor@1.9.3
modern-browsers@0.1.4
modules@0.13.0
modules-runtime@0.10.3
modern-browsers@0.1.5
modules@0.15.0
modules-runtime@0.12.0
mongo-id@1.0.7
observe-sequence@1.0.16
promise@0.11.2
random@1.1.0
random@1.2.0
reactive-var@1.0.11
spacebars@1.0.12
spacebars-compiler@1.1.0
Expand Down
4 changes: 2 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
We've teamed up with [JSDelivr](https://www.npmjs.com/settings/joypixels/packages) 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/emoji-toolkit@6.0.1/lib/js/joypixels.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emoji-toolkit@6.0.1/extras/css/joypixels.min.css"/>
<script src="https://cdn.jsdelivr.net/npm/emoji-toolkit@6.5.0/lib/js/joypixels.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/emoji-toolkit@6.5.0/extras/css/joypixels.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 [emoji-assets](https://www.github.com/joypixels/emoji-assets) and include the pngs and/or sprites into your project.** Many of our [demos](https://demos.joypixels.com/latest/) use assets locally simply by pointing the `imagePathPNG` variable to your local asset location.
Expand Down
2 changes: 1 addition & 1 deletion USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Both PHP and JavaScript libraries now have wider range of available properties. The following are available for both libraries.

- `emojiVersion` (str) - Used only to direct CDN path. This is a 2-digit version (e.g. '6.0'). Not recommended for usage below 3.0.0.
- `emojiVersion` (str) - Used only to direct CDN path. This is a 2-digit version (e.g. '6.5'). Not recommended for usage below 3.0.0.
- `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.
- `fileExtension` (str) - Defaults to .png. Set to '.svg' if using premium assets (.svg) locally.
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": "emoji-toolkit",
"version": "6.0.1",
"version": "6.5.0",
"main": [
"extras/css/joypixels.css",
"lib/js/joypixels.js"
Expand Down
2 changes: 1 addition & 1 deletion emoji.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion emoji_strategy.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/OTHER.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ By default, both the Javascript and PHP toolkits we've provided will use the nat
**HTML Output (default)**
```html
<p id="example-png">
PNG: Hello world! <img class="joypixels" alt="😄" title=":smile:" src="https://cdn.jsdelivr.net/joypixels/assets/6.0/png/unicode/32/1f604.png">
PNG: Hello world! <img class="joypixels" alt="😄" title=":smile:" src="https://cdn.jsdelivr.net/joypixels/assets/6.5/png/unicode/32/1f604.png">
</p>
```

Expand All @@ -32,7 +32,7 @@ $(document).ready(function() {
**HTML Output For Shortname Alt**
```html
<p id="example-png">
PNG: Hello world! <img class="joypixels" alt=":smile:" title=":smile:" src="https://cdn.jsdelivr.net/joypixels/assets/6.0/png/unicode/32/1f604.png">
PNG: Hello world! <img class="joypixels" alt=":smile:" title=":smile:" src="https://cdn.jsdelivr.net/joypixels/assets/6.5/png/unicode/32/1f604.png">
</p>
```

Expand Down Expand Up @@ -83,7 +83,7 @@ $(document).ready(function() {
callback(newResults);
},
template: function (shortname) {
return '<img class="joypixels" src="https://cdn.jsdelivr.net/joypixels/assets/6.0/png/unicode/32/'+unicode+'.png"/> :'+emojiStrategy[shortname].unicode+':';
return '<img class="joypixels" src="https://cdn.jsdelivr.net/joypixels/assets/6.5/png/unicode/32/'+unicode+'.png"/> :'+emojiStrategy[shortname].unicode+':';
},
replace: function (shortname) {
return ':'+shortname+': ';
Expand Down
Loading

0 comments on commit 3a13f4d

Please sign in to comment.