Skip to content

Commit e1c5859

Browse files
committed
bump version to v1.5.3
1 parent 70e9d00 commit e1c5859

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "At.js",
3-
"version": "1.5.1",
3+
"version": "1.5.3",
44
"main": [
55
"dist/js/jquery.atwho.js",
66
"dist/css/jquery.atwho.css"

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.5.1",
5+
"version": "1.5.3",
66
"demo": "http://ichord.github.com/At.js",
77
"dependencies": {
88
"ichord/Caret.js": "~0.2.2",

dist/js/jquery.atwho.js

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* at.js - 1.5.1
3-
* Copyright (c) 2016 chord.luo <chord.luo@gmail.com>;
2+
* at.js - 1.5.3
3+
* Copyright (c) 2017 chord.luo <chord.luo@gmail.com>;
44
* Homepage: http://ichord.github.com/At.js
55
* License: MIT
66
*/
@@ -88,7 +88,7 @@ DEFAULT_CALLBACKS = {
8888
});
8989
},
9090
tplEval: function(tpl, map) {
91-
var error, template;
91+
var error, error1, template;
9292
template = tpl;
9393
try {
9494
if (typeof tpl !== 'string') {
@@ -142,7 +142,7 @@ App = (function() {
142142
};
143143

144144
App.prototype.setupRootElement = function(iframe, asRoot) {
145-
var error;
145+
var error, error1;
146146
if (asRoot == null) {
147147
asRoot = false;
148148
}
@@ -408,7 +408,7 @@ Controller = (function() {
408408
};
409409

410410
Controller.prototype.callDefault = function() {
411-
var args, error, funcName;
411+
var args, error, error1, funcName;
412412
funcName = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
413413
try {
414414
return DEFAULT_CALLBACKS[funcName].apply(this, args);
@@ -434,7 +434,7 @@ Controller = (function() {
434434
};
435435

436436
Controller.prototype.getOpt = function(at, default_value) {
437-
var e;
437+
var e, error1;
438438
try {
439439
return this.setting[at];
440440
} catch (error1) {
@@ -822,30 +822,25 @@ EditableController = (function(superClass) {
822822
};
823823

824824
EditableController.prototype.insert = function(content, $li) {
825-
var data, overrides, range, suffix, suffixNode;
825+
var data, range, suffix, suffixNode;
826826
if (!this.$inputor.is(':focus')) {
827827
this.$inputor.focus();
828828
}
829-
overrides = this.getOpt("functionOverrides");
830-
if (overrides.insert) {
831-
return overrides.insert.bind(this)(content, $li);
832-
} else {
833-
suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || "\u00A0";
834-
data = $li.data('item-data');
835-
this.query.el.removeClass('atwho-query').addClass('atwho-inserted').html(content).attr('data-atwho-at-query', "" + data['atwho-at'] + this.query.text).attr('contenteditable', "false");
836-
if (range = this._getRange()) {
837-
if (this.query.el.length) {
838-
range.setEndAfter(this.query.el[0]);
839-
}
840-
range.collapse(false);
841-
range.insertNode(suffixNode = this.app.document.createTextNode("\u200D" + suffix));
842-
this._setRange('after', suffixNode, range);
843-
}
844-
if (!this.$inputor.is(':focus')) {
845-
this.$inputor.focus();
829+
suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || "\u00A0";
830+
data = $li.data('item-data');
831+
this.query.el.removeClass('atwho-query').addClass('atwho-inserted').html(content).attr('data-atwho-at-query', "" + data['atwho-at'] + this.query.text).attr('contenteditable', "false");
832+
if (range = this._getRange()) {
833+
if (this.query.el.length) {
834+
range.setEndAfter(this.query.el[0]);
846835
}
847-
return this.$inputor.change();
836+
range.collapse(false);
837+
range.insertNode(suffixNode = this.app.document.createTextNode("" + suffix));
838+
this._setRange('after', suffixNode, range);
839+
}
840+
if (!this.$inputor.is(':focus')) {
841+
this.$inputor.focus();
848842
}
843+
return this.$inputor.change();
849844
};
850845

851846
return EditableController;
@@ -1188,7 +1183,6 @@ $.fn.atwho["default"] = {
11881183
insertTpl: "${atwho-at}${name}",
11891184
headerTpl: null,
11901185
callbacks: DEFAULT_CALLBACKS,
1191-
functionOverrides: {},
11921186
searchKey: "name",
11931187
suffix: void 0,
11941188
hideWithoutSuffix: false,

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.

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ gulp.task('umd', function() {
4343

4444
gulp.task('bump', function() {
4545
gulp.src(['bower.json', 'component.json', 'package.json'])
46-
.pipe(bump({version: "1.5.1"}))
46+
.pipe(bump({version: "1.5.3"}))
4747
.pipe(gulp.dest('./'));
4848
});
4949

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"homepage": "http://ichord.github.com/At.js",
99
"license": "MIT",
10-
"version": "1.5.1",
10+
"version": "1.5.3",
1111
"repository": {
1212
"type": "git",
1313
"url": "https://github.com/ichord/At.js"

0 commit comments

Comments
 (0)