Skip to content

Commit

Permalink
功能完善。
Browse files Browse the repository at this point in the history
  • Loading branch information
eshengsky committed Mar 3, 2016
1 parent b46cdea commit 2d9fa1f
Show file tree
Hide file tree
Showing 15 changed files with 547 additions and 199 deletions.
7 changes: 2 additions & 5 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"bitwise": true,
"browser": true,
"camelcase": true,
"curly": true,
"eqeqeq": true,
"forin": true,
"freeze": false,
"indent": 2,
"maxdepth": 6,
"maxparams": 6,
"maxstatements": 50,
"maxstatements": 150,
"newcap": true,
"noarg": true,
"noempty": true,
"nonbsp": true,
"nonew": true,
"quotmark": "single",
"trailing": true,
"unused": "vars",
"immed": true,
"browser": true,
"loopfunc": true,
"jquery": true
}
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = function (grunt) {
pkg: grunt.file.readJSON('package.json'),

jshint: {
build: ['Gruntfile.js', 'src/*.js'],
build: ['Gruntfile.js', 'src/js/*.js'],
options: {
jshintrc: '.jshintrc'
}
Expand Down
26 changes: 17 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@
让文本框或可编辑div具备插入表情功能。
Let textarea or editable div has ability to insert emoji.

### 功能 Features
* 支持给textarea或可编辑div加上表情功能,自动识别元素类型。Support for adding emoji into textarea or editable div, automatic identification of element types.
* 如果是textarea,则选择表情后插入表情代码,如果是可编辑div,则直接插入表情图片。If it is textarea element,will insert code string of emoji, else, will insert emoji picture directly.
* 支持将表情代码转换为表情图片。Support for converting the code string of emoji into emoji picture.
* 支持多组表情并提供tab切换。Support for multiple groups of emoji and tabs to toggle.
* 示例已带有百度贴吧和qq高清2套表情。The demo has been with 2 sets of emojis:Baidu tieba emoji & QQ HD emoji.
* 同一页面支持多个表情实例。Support for multiple instances in one page.
## 功能 Features
* 支持给textarea或可编辑div加上表情功能,自动识别元素类型。
Support for adding emoji into textarea or editable div, automatic identification of element types.
* 如果是textarea,则选择表情后插入表情代码,如果是可编辑div,则直接插入表情图片。
If it is textarea element,will insert code string of emoji, else, will insert emoji picture directly.
* 支持自定义表情代码的格式。
Support for specifying the code format of emoji.
* 支持将表情代码转换为表情图片。
Support for converting the code string of emoji into emoji picture.
* 支持多组表情并提供tab切换。
Support for multiple groups of emoji and tabs to toggle.
* 示例已带有百度贴吧和qq高清2套表情。
The demo has been with 2 sets of emojis:Baidu tieba emoji & QQ HD emoji.
* 同一页面支持多个表情实例。
Support for multiple instances in one page.

### 示例与文档 Demo&Doc
http://eshengsky.github.io/jQuery-emoji/
## 示例与文档 Demo&Doc
[http://eshengsky.github.io/jQuery-emoji/](http://eshengsky.github.io/jQuery-emoji/)

5 changes: 5 additions & 0 deletions dist/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,8 @@ hr {
margin-top: 32px;
margin-bottom: 32px
}

pre {
padding: 0;
border: 0;
}
6 changes: 5 additions & 1 deletion dist/css/jquery.emoji.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
height: 25px;
}

.emoji_container *{
.emoji_container * {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
Expand Down Expand Up @@ -56,6 +56,8 @@

.emoji_content ul li a img {
vertical-align: middle;
max-width: 52px;
max-height: 52px;
}

.emoji_content .mCSB_scrollTools {
Expand Down Expand Up @@ -157,4 +159,6 @@

.emoji_preview img {
vertical-align: middle;
max-width: 42px;
max-height: 42px;
}
Binary file removed dist/img/tieba/Thumbs.db
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/js/jquery.emoji.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 2d9fa1f

Please sign in to comment.