Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-13 22:41:32 -05:00
Code Issues Activity

Merge pull request #5658 from acburdine/tag-fixes

Browse source 
fixed focus and duplication tag issues
This commit is contained in:
Hannah Wolfe 2015-08-11 19:42:52 +01:00
commit ee838b0173
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/client/app/components/gh-tags-input.js
View file

@ -187,7 +187,7 @@ export default Ember.Component.extend({
}, { }, {
name: 'tags', name: 'tags',
source: tags source: tags
}).bind('typeahead:selected', Ember.run.bind(this, 'typeaheadAdd')); }).bind('typeahead:select', Ember.run.bind(this, 'typeaheadAdd'));
}, },
destroyTypeahead: function () { destroyTypeahead: function () {
@ -195,6 +195,7 @@ export default Ember.Component.extend({
}, },
reloadTypeahead: function (refocus) { reloadTypeahead: function (refocus) {
refocus = (typeof refocus !== 'undefined') ? refocus : true; // set default refocus value
this.set('isReloading', true); this.set('isReloading', true);
this.destroyTypeahead(); this.destroyTypeahead();
this.initTypeahead(); this.initTypeahead();
@ -216,7 +217,7 @@ export default Ember.Component.extend({
}, },
// Used for typeahead selection // Used for typeahead selection
typeaheadAdd: function (obj, datum) { typeaheadAdd: function (event, datum) {
if (datum) { if (datum) {
// this is needed so two tags with the same name aren't added // this is needed so two tags with the same name aren't added
this.$('#tag-input').typeahead('val', ''); this.$('#tag-input').typeahead('val', '');
@ -228,9 +229,10 @@ export default Ember.Component.extend({
addTag: function (tagName) { addTag: function (tagName) {
var tagToAdd, checkTag; var tagToAdd, checkTag;
this.$('#tag-input').typeahead('val', '');
// Prevent multiple tags with the same name occuring // Prevent multiple tags with the same name occuring
if (this.get('currentTags').findBy('name', tagName)) { if (this.get('currentTags').findBy('name', tagName)) {
this.$('#tag-input').typeahead('val', '');
return; return;
} }
@ -247,7 +249,6 @@ export default Ember.Component.extend({
this.set('isDirty', true); this.set('isDirty', true);
this.set('highlightIndex', null); this.set('highlightIndex', null);
this.get('currentTags').pushObject(tagToAdd); this.get('currentTags').pushObject(tagToAdd);
this.$('#tag-input').typeahead('val', '');
}, },
deleteTag: function (tag) { deleteTag: function (tag) {