Permalink
Please sign in to comment.
Showing
with
31 additions
and 24 deletions.
- +1 −0 AUTHORS
- +6 −0 History.md
- +8 −7 README.md
- +2 −2 lib/emoji.js
- +5 −6 package.json
- +3 −3 test/emoji.test.js
- +6 −6 tpl/emoji_header.js
| @@ -7,3 +7,4 @@ Nariman Haghighi <[email protected]> | ||
| Julian Bäume <[email protected]> (https://github.com/johnyb) | ||
| pachtymichuk <[email protected]> (https://github.com/pachtymichuk) | ||
| Jonathan Ong <[email protected]> (https://github.com/jonathanong) | ||
| +Craig Condon <[email protected]> (https://github.com/crcn) | ||
| @@ -89,21 +89,22 @@ sh ./bin/syncdata.sh | ||
| ## Authors | ||
| -Missing emoji support by: Nariman Haghighi <[email protected]>. | ||
| +Missing emojis support by: Nariman Haghighi <auspicious@gmail.com> and Jonathan Ong <jonathanrichardong@gmail.com>. | ||
| ```bash | ||
| $ git summary | ||
| project : emoji | ||
| repo age : 1 year, 8 months | ||
| - active : 17 days | ||
| - commits : 56 | ||
| + active : 18 days | ||
| + commits : 61 | ||
| files : 24 | ||
| authors : | ||
| - 44 fengmk2 78.6% | ||
| - 6 pachtymichuk 10.7% | ||
| - 4 Jonathan Ong 7.1% | ||
| - 2 Julian Bäume 3.6% | ||
| + 48 fengmk2 78.7% | ||
| + 6 pachtymichuk 9.8% | ||
| + 4 Jonathan Ong 6.6% | ||
| + 2 Julian Bäume 3.3% | ||
| + 1 Craig Condon 1.6% | ||
| ``` | ||
| ## License | ||
| @@ -5,7 +5,7 @@ | ||
| * This file auto create by `bin/create_emoji_js.py`. | ||
| * Emoji\'s table come from <a href="http://code.iamcal.com/php/emoji/">http://code.iamcal.com/php/emoji/</a> | ||
| * | ||
| - * Copyright(c) 2012 fengmk2 <[email protected]> | ||
| + * Copyright(c) 2012 - 2014 fengmk2 <[email protected]> | ||
| * MIT Licensed | ||
| */ | ||
| @@ -1017,4 +1017,4 @@ jEmoji.googleToUnified = googleToUnified; | ||
| return jEmoji; | ||
| -}); | ||
| +}); | ||
11
package.json
| @@ -2,20 +2,19 @@ | ||
| "author": "fengmk2 <[email protected]> (http://fengmk2.github.com/)", | ||
| "name": "emoji", | ||
| "description": "This library allows the handling and conversion of Emoji in Javascript.", | ||
| - "version": "0.3.1", | ||
| + "version": "0.3.2", | ||
| "homepage": "https://github.com/fengmk2/emoji", | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git://github.com/fengmk2/emoji.git" | ||
| }, | ||
| "main": "index.js", | ||
| "scripts": { | ||
| - "test": "make test-all", | ||
| + "test": "make test-all" | ||
| + }, | ||
| + "config": { | ||
| "blanket": { | ||
| - "pattern": "emoji/lib", | ||
| - "data-cover-flags": { | ||
| - "debug": false | ||
| - } | ||
| + "pattern": "emoji/lib" | ||
| }, | ||
| "travis-cov": { | ||
| "threshold": 95 | ||
| @@ -1,6 +1,6 @@ | ||
| /*! | ||
| * emoji - test/emoji.js | ||
| - * Copyright(c) 2012 -2013 fengmk2 <[email protected]> | ||
| + * Copyright(c) 2012 -2014 fengmk2 <[email protected]> | ||
| * MIT Licensed | ||
| */ | ||
| @@ -116,8 +116,8 @@ describe('emoji.js', function () { | ||
| ]; | ||
| regular_expressions.forEach(function (re) { | ||
| - it(re + ' should be a regular expression', function () { | ||
| - emoji[re].should.be.a.RegExp; | ||
| + it(re + ' should be a Function', function () { | ||
| + emoji[re].should.be.a.Function; | ||
| }); | ||
| }); | ||
| }); | ||
| @@ -4,14 +4,14 @@ | ||
| * | ||
| * This file auto create by `bin/create_emoji_js.py`. | ||
| * Emoji\'s table come from <a href="http://code.iamcal.com/php/emoji/">http://code.iamcal.com/php/emoji/</a> | ||
| - * | ||
| - * Copyright(c) 2012 fengmk2 <[email protected]> | ||
| + * | ||
| + * Copyright(c) 2012 - 2014 fengmk2 <[email protected]> | ||
| * MIT Licensed | ||
| */ | ||
| ;(function (name, definition) { | ||
| // Come from eventproxy: https://github.com/JacksonTian/eventproxy/blob/master/lib/eventproxy.js#L7 | ||
| - | ||
| + | ||
| // this is considered "safe": | ||
| var hasDefine = typeof define === 'function'; | ||
| var hasExports = typeof module !== 'undefined' && module.exports; | ||
| @@ -33,9 +33,9 @@ var jEmoji = {}; | ||
| /** | ||
| * Emoji code map. | ||
| * | ||
| - * format: | ||
| + * format: | ||
| * Unified: [unified_unicode, title, classname, DoCoMo, KDDI, Softbank, Google]' | ||
| - * | ||
| + * | ||
| * @type {Object} | ||
| */ | ||
| var EMOJI_MAP = jEmoji.EMOJI_MAP = { | ||
| @@ -47,4 +47,4 @@ var EMOJI_MAP = jEmoji.EMOJI_MAP = { | ||
| "🍋": ["U+1F34B", "lemon", "1f34b", ["-", "-"], ["", "U+EABA"], ["", "U+E346"], ["", "U+FE052"]], | ||
| "😎": ["U+1F60E", "smiling face with sunglasses", "1f60e", ["", "U+E726"], ["", "U+E5C4"], ["", "U+E106"], ["", "U+FE327"]], | ||
| "😀": ["U+1F600", "grinning face", "1f600", ["", "U+E753"], ["", "U+EB80"], ["", "U+E404"], ["", "U+FE333"]], | ||
| - // table.html | ||
| + // table.html | ||
0 comments on commit
84c7157