Skip to content

Commit 29700b6

Browse files
committed
update to v1.3.0
1 parent 7f2189d commit 29700b6

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### v1.3.0
2+
3+
* 7f2189d - fix #294 inserts "" suffix in contenteditable
4+
* bae95d9 - add `tabSelectsMatch` setting to make tab selection optional
5+
* e966aba - Merge pull request #298 from kkirsche/patch-1 - Harold.Luo
6+
* 9f78239 - Remove moot `version` property from bower.json - Kevin Kirsche
7+
18
### v1.2.0
29

310
db09ac7 -> 886613f

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "At.js",
33
"repo": "ichord/At.js",
44
"description": "Add Github like mentions autocomplete to your application.",
5-
"version": "1.2.0",
5+
"version": "1.3.0",
66
"demo": "http://ichord.github.com/At.js",
77
"dependencies": {
88
"ichord/Caret.js": "~0.2.2",

dist/js/jquery.atwho.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! jquery.atwho - v1.2.0 %>
1+
/*! jquery.atwho - v1.3.0 %>
22
* Copyright (c) 2015 chord.luo <[email protected]>;
33
* homepage: http://ichord.github.com/At.js
44
* Licensed MIT

dist/js/jquery.atwho.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<meta http-equiv="x-ua-compatible" content="IE=Edge"/>
55
<title>At.js</title>
66
<link rel="stylesheet" href="dist/css/jquery.atwho.css" />
7-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
8-
<script type="text/javascript" src="http://ichord.github.io/Caret.js/src/jquery.caret.js"></script>
9-
<!-- // <script type="text/javascript" src="bower_components/jquery/dist/jquery.js"></script> -->
10-
<!-- // <script type="text/javascript" src="bower_components/Caret.js/dist/jquery.caret.js"></script> -->
7+
<!-- // <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> -->
8+
<!-- // <script type="text/javascript" src="http://ichord.github.io/Caret.js/src/jquery.caret.js"></script> -->
9+
<script type="text/javascript" src="bower_components/jquery/dist/jquery.js"></script>
10+
<script type="text/javascript" src="bower_components/Caret.js/dist/jquery.caret.js"></script>
1111
<script type="text/javascript" src="dist/js/jquery.atwho.js"></script>
1212
<script type="text/javascript">
1313
$(function(){
@@ -42,10 +42,12 @@
4242
var emojis = $.map(emojis, function(value, i) {return {key: value, name:value}});
4343

4444
var at_config = {
45-
at: "@",
45+
at: "[",
4646
data: names,
47+
// insertTpl: '[${name}',
4748
displayTpl: "<li>${name} <small>${email}</small></li>",
48-
limit: 200
49+
limit: 200,
50+
suffix: "]"
4951
}
5052
var emoji_config = {
5153
at: ":",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"homepage": "http://ichord.github.com/At.js",
88
"license": "MIT",
9-
"version": "1.2.0",
9+
"version": "1.3.0",
1010
"engines": {
1111
"node": ">= 0.6.0"
1212
},

0 commit comments

Comments
 (0)