ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified tag input

Browse source
This commit is contained in:
Marcin Kurczewski 2014-11-09 20:07:04 +01:00
parent a56bd55b50
commit 84e145609a
1 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
public_html/js/Controls/TagInput.js
View file

@ -28,7 +28,7 @@ App.Controls.TagInput = function($underlyingInput) {
var $suggestions = jQuery('<div class="related-tags"><span>Suggested tags:</span><ul>');
init();
render();
initAutocomplete();
initAutoComplete();
function init() {
if ($underlyingInput.length === 0) {
@ -59,21 +59,18 @@ App.Controls.TagInput = function($underlyingInput) {
$suggestions.insertAfter($wrapper);
$siblings.insertAfter($wrapper);
addTagsFromText(
$underlyingInput.val(), {
disableImplications: true,
disableSuggestions: true});
processText($underlyingInput.val(), addTagDirectly);
$underlyingInput.val('');
}
function initAutocomplete() {
var autocomplete = new App.Controls.AutoCompleteInput($input);
autocomplete.onApply = function(text) {
addTagsFromText(text);
function initAutoComplete() {
var autoComplete = new App.Controls.AutoCompleteInput($input);
autoComplete.onApply = function(text) {
processText(text, addTagDirectly);
$input.val('');
};
autocomplete.additionalFilter = function(results) {
autoComplete.additionalFilter = function(results) {
return _.filter(results, function(resultItem) {
return !_.contains(getTags(), resultItem[0]);
});
@ -104,7 +101,7 @@ App.Controls.TagInput = function($underlyingInput) {
return;
}
addTagsFromTextWithoutLast(pastedText);
processTextWithoutLast(pastedText, addTag);
});
$input.bind('keydown', function(e) {
@ -124,19 +121,19 @@ App.Controls.TagInput = function($underlyingInput) {
}
});
function addTagsFromText(text, options) {
function processText(text, callback) {
var tagNamesToAdd = text.split(/\s+/);
_.map(tagNamesToAdd, function(tagName) { addTag(tagName, options); });
_.map(tagNamesToAdd, function(tagName) { callback(tagName); });
}
function addTagsFromTextWithoutLast(text) {
function processTextWithoutLast(text, callback) {
var tagNamesToAdd = text.split(/\s+/);
var lastTagName = tagNamesToAdd.pop();
_.map(tagNamesToAdd, function(tagName) { addTag(tagName, options); });
_.map(tagNamesToAdd, function(tagName) { callback(tagName); });
$input.val(lastTagName);
}
function addTag(tagName, options) {
function addTag(tagName) {
tagName = tagName.trim();
if (tagName.length === 0) {
return;
@ -154,38 +151,37 @@ App.Controls.TagInput = function($underlyingInput) {
if (isTaggedWith(tagName)) {
flashTagRed(tagName);
} else {
beforeTagAdded(tagName, options);
beforeTagAdded(tagName);
var exportedTag = getExportedTag(tagName);
if (!exportedTag || !exportedTag.banned) {
tags.push(tagName);
var $elem = createListElement(tagName);
$tagList.append($elem);
addTagDirectly(tagName);
}
afterTagAdded(tagName, options);
afterTagAdded(tagName);
}
}
function addTagDirectly(tagName) {
tags.push(tagName);
var $elem = createListElement(tagName);
$tagList.append($elem);
}
function beforeTagAdded(tagName) {
if (typeof(options.beforeTagAdded) === 'function') {
options.beforeTagAdded(tagName);
}
}
function afterTagAdded(tagName, options) {
function afterTagAdded(tagName) {
var tag = getExportedTag(tagName);
if (tag) {
if (!options || !options.disableImplications) {
_.each(tag.implications, function(impliedTagName) {
addTag(impliedTagName);
flashTagYellow(impliedTagName);
});
}
if (!options || !options.disableSuggestions) {
showOrHideSuggestions(tag.suggestions);
}
_.each(tag.implications, function(impliedTagName) {
addTag(impliedTagName);
flashTagYellow(impliedTagName);
});
showOrHideSuggestions(tag.suggestions);
}
}