From 82e3bb5f06dc531ee1080a0313833791a1c1f3c7 Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 28 Mar 2017 20:11:07 +0200 Subject: [PATCH] Tag list: use awesomplete for tag auto completion --- tpl/default/css/shaarli.css | 4 +++ tpl/default/js/shaarli.js | 62 +++++++++++++++++++++++++++++++++++-- tpl/default/tag.list.html | 6 +++- 3 files changed, 69 insertions(+), 3 deletions(-) diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 2eda5df4..28920648 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -1098,6 +1098,10 @@ form[name="linkform"].page-form { color: #7f7f7f; } +#taglist .rename-tag-form { + display: none; +} + #taglist .delete-tag { color: #ac2925; display: none; diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index e19e9001..4ebb7815 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -418,6 +418,9 @@ window.onload = function () { * * TODO: support error code in the backend for AJAX requests */ + var existingTags = document.querySelector('input[name="taglist"]').value.split(' '); + var awesomepletes = []; + // Display/Hide rename form var renameTagButtons = document.querySelectorAll('.rename-tag'); [].forEach.call(renameTagButtons, function(rename) { @@ -425,7 +428,12 @@ window.onload = function () { event.preventDefault(); var block = findParent(event.target, 'div', {'class': 'tag-list-item'}); var form = block.querySelector('.rename-tag-form'); - form.style.display = form.style.display == 'none' ? 'block' : 'none'; + if (form.style.display == 'none' || form.style.display == '') { + form.style.display = 'block'; + } else { + form.style.display = 'none'; + } + block.querySelector('input').focus(); }); }); @@ -454,10 +462,18 @@ window.onload = function () { block.setAttribute('data-tag', totag); input.setAttribute('name', totag); input.setAttribute('value', totag); - input.parentNode.style.display = 'none'; + findParent(input, 'div', {'class': 'rename-tag-form'}).style.display = 'none'; block.querySelector('a.tag-link').innerHTML = htmlEntities(totag); block.querySelector('a.tag-link').setAttribute('href', '?searchtags='+ encodeURIComponent(totag)); block.querySelector('a.rename-tag').setAttribute('href', '?do=changetag&fromtag='+ encodeURIComponent(totag)); + + // Refresh awesomplete values + for (var key in existingTags) { + if (existingTags[key] == fromtag) { + existingTags[key] = totag; + } + } + awesomepletes = updateAwesompleteList('.rename-tag-input', existingTags, awesomepletes); } }; xhr.send('renametag=1&fromtag='+ encodeURIComponent(fromtag) +'&totag='+ encodeURIComponent(totag) +'&token='+ token); @@ -468,6 +484,7 @@ window.onload = function () { // Validate input with enter key var renameTagInputs = document.querySelectorAll('.rename-tag-input'); [].forEach.call(renameTagInputs, function(rename) { + rename.addEventListener('keypress', function(event) { if (event.keyCode === 13) { // enter findParent(event.target, 'div', {'class': 'tag-list-item'}).querySelector('.validate-rename-tag').click(); @@ -497,8 +514,19 @@ window.onload = function () { } }); }); + + updateAwesompleteList('.rename-tag-input', document.querySelector('input[name="taglist"]').value.split(' '), awesomepletes); }; +/** + * Find a parent element according to its tag and its attributes + * + * @param element Element where to start the search + * @param tagName Expected parent tag name + * @param attributes Associative array of expected attributes (name=>value). + * + * @returns Found element or null. + */ function findParent(element, tagName, attributes) { while (element) { @@ -522,6 +550,9 @@ function findParent(element, tagName, attributes) return null; } +/** + * Ajax request to refresh the CSRF token. + */ function refreshToken() { var xhr = new XMLHttpRequest(); @@ -533,6 +564,33 @@ function refreshToken() xhr.send(); } +/** + * Update awesomplete list of tag for all elements matching the given selector + * + * @param selector CSS selector + * @param tags Array of tags + * @param instances List of existing awesomplete instances + */ +function updateAwesompleteList(selector, tags, instances) +{ + // First load: create Awesomplete instances + if (instances.length == 0) { + var elements = document.querySelectorAll(selector); + [].forEach.call(elements, function (element) { + instances.push(new Awesomplete( + element, + {'list': tags} + )); + }); + } else { + // Update awesomplete tag list + for (var key in instances) { + instances[key].list = tags; + } + } + return instances; +} + /** * html_entities in JS * diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index 98971051..62e2e7c6 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html @@ -57,7 +57,7 @@ {/loop} {if="isLoggedIn()===true"} - +{if="isLoggedIn()===true"} +