Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for the correct HTML5 elements and ARIA attributes #3

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
31 changes: 28 additions & 3 deletions auto-complete.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ var autoComplete = (function(){
// escape special characters
search = search.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
var re = new RegExp("(" + search.split(' ').join('|') + ")", "gi");
return '<div class="autocomplete-suggestion" data-val="' + item + '">' + item.replace(re, "<b>$1</b>") + '</div>';
var option = document.createElement('div');

option.id = Math.random().toString(36).substring(7);
option.className = "autocomplete-suggestion";
option.setAttribute('role', 'option');
option.setAttribute('data-val', item);
option.innerHTML = item.replace(re, "<b>$1</b>");

return option.outerHTML;
},
onSelect: function(e, term, item){}
};
Expand All @@ -49,17 +57,29 @@ var autoComplete = (function(){
var elems = typeof o.selector == 'object' ? [o.selector] : document.querySelectorAll(o.selector);
for (var i=0; i<elems.length; i++) {
var that = elems[i];
var autocompleteID = Math.random().toString(36).substring(7);

that.setAttribute('role', 'combobox');
that.setAttribute('aria-expanded', 'false');
that.setAttribute('aria-autocomplete', 'list');
that.setAttribute('aria-owns', autocompleteID);

// create suggestions container "sc"
that.sc = document.createElement('div');
that.sc.id = autocompleteID;
that.sc.className = 'autocomplete-suggestions '+o.menuClass;
that.sc.setAttribute('role', 'listbox');
that.sc.setAttribute('aria-live', 'polite');
that.sc.setAttribute('aria-relevant', 'additions removals');

that.autocompleteAttr = that.getAttribute('autocomplete');
that.setAttribute('autocomplete', 'off');
that.cache = {};
that.last_val = '';

that.updateSC = function(resize, next){
that.setAttribute('aria-expanded', 'true');

var rect = that.getBoundingClientRect();
that.sc.style.left = rect.left + (window.pageXOffset || document.documentElement.scrollLeft) + 'px';
that.sc.style.top = rect.bottom + (window.pageYOffset || document.documentElement.scrollTop) + 1 + 'px';
Expand All @@ -84,12 +104,13 @@ var autoComplete = (function(){

live('autocomplete-suggestion', 'mouseleave', function(e){
var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
if (sel) setTimeout(function(){ sel.className = sel.className.replace('selected', ''); }, 20);
if (sel) setTimeout(function(){ sel.className = sel.className.replace('selected', ''); that.removeAttribute('aria-activedescendant');}, 20);
}, that.sc);

live('autocomplete-suggestion', 'mouseover', function(e){
var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
if (sel) sel.className = sel.className.replace('selected', '');
that.setAttribute('aria-activedescendant', this.id);
this.className += ' selected';
}, that.sc);

Expand Down Expand Up @@ -123,6 +144,7 @@ var autoComplete = (function(){
}
else
that.sc.style.display = 'none';
that.removeAttribute('aria-activedescendant');
}

that.keydownHandler = function(e){
Expand All @@ -134,14 +156,16 @@ var autoComplete = (function(){
next = (key == 40) ? that.sc.querySelector('.autocomplete-suggestion') : that.sc.childNodes[that.sc.childNodes.length - 1]; // first : last
next.className += ' selected';
that.value = next.getAttribute('data-val');
that.setAttribute('aria-activedescendant', next.id);
} else {
next = (key == 40) ? sel.nextSibling : sel.previousSibling;
if (next) {
sel.className = sel.className.replace('selected', '');
next.className += ' selected';
that.value = next.getAttribute('data-val');
that.setAttribute('aria-activedescendant', next.id);
}
else { sel.className = sel.className.replace('selected', ''); that.value = that.last_val; next = 0; }
else { sel.className = sel.className.replace('selected', ''); that.value = that.last_val; next = 0; that.removeAttribute('aria-activedescendant'); }
}
that.updateSC(0, next);
return false;
Expand Down Expand Up @@ -198,6 +222,7 @@ var autoComplete = (function(){
removeEvent(that, 'focus', that.focusHandler);
removeEvent(that, 'keydown', that.keydownHandler);
removeEvent(that, 'keyup', that.keyupHandler);
that.removeAttribute('aria-activedescendant');
if (that.autocompleteAttr)
that.setAttribute('autocomplete', that.autocompleteAttr);
else
Expand Down
2 changes: 1 addition & 1 deletion auto-complete.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"name": "javascript-auto-complete",
"version": "1.0.4",
"description": "An extremely lightweight vanilla JavaScript completion suggester.",
"homepage": "https://github.com/SchipholRedesign/JavaScript-autoComplete",
"main": "auto-complete.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/SchipholRedesign/JavaScript-autoComplete.git"
},
"authors": [{
"name": "Simon Steinberger",
"email": "simon@pixabay.com",
"url": "https://pixabay.com/users/Simon/"
}],
"contributors": [{
"name" : "Michiel Renty",
"email" : "michiel@mrenty.com",
"url" : "http://mrenty.com/"
}],
"keywords": [
"autocomplete",
"autosuggest",
"autosuggester",
"suggest",
"suggester",
"completer",
"select",
"dropdown",
"ajax"
],
"licenses": [{
"type": "MIT",
"url": "http://www.opensource.org/licenses/mit-license.php"
}],
"bugs": {
"url": "https://github.com/SchipholRedesign/JavaScript-autoComplete/issues"
},
"ignore": [
"bower.json",
"demo.html",
"readme.md"
]
}
5 changes: 5 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,16 @@ https://goodies.pixabay.com/javascript/auto-complete/demo.html

* Lightweight: 5.4 kB of JavaScript - less than 2.4 kB gzipped
* Fully flexible data source
* Fully accessible
* Smart caching, delay and minimum character settings
* Callbacks

## Changelog

### Version 1.0.4 - 2015/11/11

* Added ARIA support

### Version 1.0.3 - 2015/11/02

* Fixed #2: Unspecified error on IE 10.
Expand Down