Skip to content

Commit f932bb1

Browse files
fengmk2fengmk2
committed
Release 0.2.2
1 parent d2b733a commit f932bb1

10 files changed

+35
-20
lines changed

‎AUTHORS

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Ordered by date of first contribution.
2-
# Auto-generated by 'contributors' on Mon, 17 Feb 2014 06:20:04 GMT.
2+
# Auto-generated by 'contributors' on Tue, 18 Feb 2014 01:35:55 GMT.
33
# https://github.com/xingrz/node-contributors
44

55
fengmk2 <[email protected]> (https://github.com/fengmk2)
6+
Nariman Haghighi <[email protected]>
7+
Julian Bäume <[email protected]> (https://github.com/johnyb)
8+
pachtymichuk <[email protected]> (https://github.com/pachtymichuk)

‎History.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11

2+
0.2.2 / 2014-02-18
3+
==================
4+
5+
* add AUTHORS
6+
* sprite sheet is optimized (@pachtymichuk)
7+
* add npm image
8+
* support coveralls
9+
* update faces
10+
211
0.2.1 / 2013-06-18
312
==================
413

‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This software is licensed under the MIT License.
22

3-
Copyright (C) 2012 - 2013 fengmk2 <[email protected]>
3+
Copyright (C) 2012 - 2014 fengmk2 <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test-all: test test-cov
3232
test-coveralls:
3333
@$(MAKE) test
3434
@echo TRAVIS_JOB_ID $(TRAVIS_JOB_ID)
35-
@$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js
35+
-@$(MAKE) test MOCHA_OPTS='--require blanket' REPORTER=mocha-lcov-reporter | ./node_modules/coveralls/bin/coveralls.js
3636

3737
contributors: install
3838
@./node_modules/.bin/contributors -f plain -o AUTHORS

‎README.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,24 @@ sh ./bin/syncdata.sh
9292
Missing emoji support by: Nariman Haghighi <[email protected]>.
9393

9494
```bash
95-
$ git summary
95+
git summary
9696

9797
project : emoji
98-
repo age : 12 months
99-
active : 10 days
100-
commits : 34
101-
files : 23
98+
repo age : 1 year, 8 months
99+
active : 16 days
100+
commits : 41
101+
files : 24
102102
authors :
103-
32 fengmk2 94.1%
104-
2 Julian Baume 5.9%
103+
38 fengmk2 92.7%
104+
2 Julian Bäume 4.9%
105+
1 pachtymichuk 2.4%
105106
```
106107

107108
## License
108109

109110
(The MIT License)
110111

111-
Copyright (c) 2012 - 2013 fengmk2 <[email protected]>.
112+
Copyright (c) 2012 - 2014 fengmk2 <[email protected]>.
112113

113114
Permission is hereby granted, free of charge, to any person obtaining
114115
a copy of this software and associated documentation files (the

‎bin/syncdata.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22

3-
curl -o lib/emoji.png https://raw.github.com/iamcal/php-emoji/master/emoji.png
3+
# https://github.com/fengmk2/emoji/pull/6: sprite sheet is optimized
4+
# curl -o lib/emoji.png https://raw.github.com/iamcal/php-emoji/master/emoji.png
5+
46
curl -o lib/emoji.css https://raw.github.com/iamcal/php-emoji/master/emoji.css
57
cat tpl/emoji_missing.css >> lib/emoji.css
68
curl -o lib/table.htm https://raw.github.com/iamcal/php-emoji/master/table.htm

‎component.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "fengmk2 <[email protected]> (http://fengmk2.github.com/)",
33
"name": "emoji",
44
"description": "This library allows the handling and conversion of Emoji in Javascript.",
5-
"version": "0.2.1",
5+
"version": "0.2.2",
66
"homepage": "https://github.com/fengmk2/emoji",
77
"repository": {
88
"type": "git",
@@ -11,7 +11,7 @@
1111
"main": [
1212
"./lib/emoji.js",
1313
"./lib/emoji.css",
14-
"./lib/iphone_emoji.png"
14+
"./lib/emoji.png"
1515
],
1616
"dependencies": {
1717
"jquery": ">=1.7.0"

‎demo.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<head>
44
<meta charset="utf-8" />
55
<title>emojs.js demo</title>
6-
<link href="http://fengmk2.github.com/emoji/emoji.css?v=0.2.0" rel="stylesheet" type="text/css" />
7-
<script src="http://fengmk2.github.com/js/jquery-1.7.min.js"></script>
8-
<script src="http://fengmk2.github.com/emoji/emoji.js?v=0.2.0"></script>
6+
<link href="http://fengmk2.github.com/emoji/emoji.css?v=0.2.2" rel="stylesheet" type="text/css" />
7+
<script src="http://cdn.staticfile.org/jquery/2.1.0/jquery.min.js"></script>
8+
<script src="http://fengmk2.github.com/emoji/emoji.js?v=0.2.2"></script>
99
</head>
1010
<body>
1111
<div class="emojstext">
@@ -759,4 +759,4 @@
759759
});
760760
</script>
761761
</body>
762-
</html>
762+
</html>

‎lib/emoji.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.emoji { background: url("emoji.png") top left no-repeat; width: 20px; height: 20px; display: -moz-inline-stack; display: inline-block; vertical-align: top; zoom: 1; *display: inline; }
1+
.emoji { background: url("emoji.png?v=0.2.2") top left no-repeat; width: 20px; height: 20px; display: -moz-inline-stack; display: inline-block; vertical-align: top; zoom: 1; *display: inline; }
22
.emoji2600 { background-position: -500px -120px; }
33
.emoji2601 { background-position: -500px -140px; }
44
.emoji2614 { background-position: -500px -200px; }

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "fengmk2 <[email protected]> (http://fengmk2.github.com/)",
33
"name": "emoji",
44
"description": "This library allows the handling and conversion of Emoji in Javascript.",
5-
"version": "0.2.1",
5+
"version": "0.2.2",
66
"homepage": "https://github.com/fengmk2/emoji",
77
"repository": {
88
"type": "git",

0 commit comments

Comments
 (0)