github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-30 12:38:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Limited tag value autosuggestions based on tag name

Browse Source 
As requested on #121
This commit is contained in:
Dan Brown
2016-06-04 14:54:31 +01:00
parent 6c1e06bf86
commit 246d1621f5
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
resources/assets/js/directives.js
View File

@ -378,7 +378,7 @@ module.exports = function (ngApp, events) {
}
}]);
ngApp.directive('autosuggestions', ['$http', function($http) {
ngApp.directive('tagAutosuggestions', ['$http', function($http) {
return {
restrict: 'A',
link: function(scope, elem, attrs) {
@ -403,6 +403,8 @@ module.exports = function (ngApp, events) {
let $input = $(this);
let val = $input.val();
let url = $input.attr('autosuggest');
let type = $input.attr('autosuggest-type');
// No suggestions until at least 3 chars
if (val.length < 3) {
if (isShowing) {
@ -410,12 +412,21 @@ module.exports = function (ngApp, events) {
isShowing = false;
}
return;
};
}
// Add name param to request if for a value
if (type.toLowerCase() === 'value') {
let $nameInput = $input.closest('tr').find('[autosuggest-type="name"]').first();
let nameVal = $nameInput.val();
if (nameVal === '') return;
url += '?name=' + encodeURIComponent(nameVal);
console.log(url);
}
let suggestionPromise = getSuggestions(val.slice(0, 3), url);
suggestionPromise.then((suggestions) => {
suggestionPromise.then(suggestions => {
if (val.length > 2) {
suggestions = suggestions.filter((item) => {
suggestions = suggestions.filter(item => {
return item.toLowerCase().indexOf(val.toLowerCase()) !== -1;
}).slice(0, 4);
displaySuggestions($input, suggestions);
@ -448,15 +459,17 @@ module.exports = function (ngApp, events) {
let newActive = (active === 0) ? suggestCount-1 : active - 1;
changeActiveTo(newActive, suggestionElems);
}
// Enter key
else if (event.keyCode === 13) {
// Enter or tab key
else if (event.keyCode === 13 || event.keyCode === 9) {
let text = suggestionElems[active].textContent;
currentInput[0].value = text;
currentInput.focus();
$suggestionBox.hide();
isShowing = false;
event.preventDefault();
return false;
if (event.keyCode === 13) {
event.preventDefault();
return false;
}
}
});
@ -523,7 +536,8 @@ module.exports = function (ngApp, events) {
// Get suggestions & cache
function getSuggestions(input, url) {
let searchUrl = url + '?search=' + encodeURIComponent(input);
let hasQuery = url.indexOf('?') !== -1;
let searchUrl = url + (hasQuery?'&':'?') + 'search=' + encodeURIComponent(input);
// Get from local cache if exists
if (localCache[searchUrl]) {