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.

Sign up for GitHub

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

Simplified suggestionsContainer creation #297

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Simplified suggestionsContainer creation #297

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1d9069
simplified creation of the suggestion container and got rid of create…
leonar15 Jan 13, 2015
6391561
this.suggestionsContainer is now a jQuery object, so we can use it di…
leonar15 Jan 13, 2015
72b289f
combined multiple foo.on() lines to simplify listener attachment
leonar15 Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 39 additions & 45 deletions src/jquery.autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@
return {
escapeRegExChars: function (value) {
return value.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
},
createNode: function (containerClass) {
var div = document.createElement('div');
div.className = containerClass;
div.style.position = 'absolute';
div.style.display = 'none';
return div;
}
};
}()),
Expand Down Expand Up @@ -157,32 +150,31 @@
that.noSuggestionsContainer = $('<div class="autocomplete-no-suggestion"></div>')
.html(this.options.noSuggestionNotice).get(0);

that.suggestionsContainer = Autocomplete.utils.createNode(options.containerClass);

container = $(that.suggestionsContainer);

container.appendTo(options.appendTo);
container = that.suggestionsContainer = $('<div>')
.addClass(options.containerClass)
.css({position: 'absolute', display: 'none'})
.appendTo(options.appendTo);

// Only set width if it was provided:
if (options.width !== 'auto') {
container.width(options.width);
}

// Listen for mouse over event on suggestions list:
container.on('mouseover.autocomplete', suggestionSelector, function () {
that.activate($(this).data('index'));
});

// Deselect active element when mouse leaves suggestions container:
container.on('mouseout.autocomplete', function () {
that.selectedIndex = -1;
container.children('.' + selected).removeClass(selected);
});

// Listen for click event on suggestions list:
container.on('click.autocomplete', suggestionSelector, function () {
that.select($(this).data('index'));
});
// Add listeners to suggestion list
container
// Listen for mouse over event on suggestions list:
.on('mouseover.autocomplete', suggestionSelector, function () {
that.activate($(this).data('index'));
})
// Deselect active element when mouse leaves suggestions container:
.on('mouseout.autocomplete', function () {
that.selectedIndex = -1;
container.children('.' + selected).removeClass(selected);
})
// Listen for click event on suggestions list:
.on('click.autocomplete', suggestionSelector, function () {
that.select($(this).data('index'));
});

that.fixPositionCapture = function () {
if (that.visible) {
Expand All @@ -192,12 +184,14 @@

$(window).on('resize.autocomplete', that.fixPositionCapture);

that.el.on('keydown.autocomplete', function (e) { that.onKeyPress(e); });
that.el.on('keyup.autocomplete', function (e) { that.onKeyUp(e); });
that.el.on('blur.autocomplete', function () { that.onBlur(); });
that.el.on('focus.autocomplete', function () { that.onFocus(); });
that.el.on('change.autocomplete', function (e) { that.onKeyUp(e); });
that.el.on('input.autocomplete', function (e) { that.onKeyUp(e); });
// Add listeners to input field
that.el
.on('keydown.autocomplete', function (e) { that.onKeyPress(e); })
.on('keyup.autocomplete', function (e) { that.onKeyUp(e); })
.on('blur.autocomplete', function () { that.onBlur(); })
.on('focus.autocomplete', function () { that.onFocus(); })
.on('change.autocomplete', function (e) { that.onKeyUp(e); })
.on('input.autocomplete', function (e) { that.onKeyUp(e); });
},

onFocus: function () {
Expand Down Expand Up @@ -227,7 +221,7 @@
options.orientation = that.validateOrientation(options.orientation, 'bottom');

// Adjust height, width and z-index:
$(that.suggestionsContainer).css({
that.suggestionsContainer.css({
'max-height': options.maxHeight + 'px',
'width': options.width + 'px',
'z-index': options.zIndex
Expand Down Expand Up @@ -263,7 +257,7 @@
// Use only when container has already its content

var that = this,
$container = $(that.suggestionsContainer),
$container = that.suggestionsContainer,
containerParent = $container.parent().get(0);
// Fix position automatically when appended to body.
// In other cases force parameter must be given.
Expand Down Expand Up @@ -616,7 +610,7 @@
that.visible = false;
that.selectedIndex = -1;
clearInterval(that.onChangeInterval);
$(that.suggestionsContainer).hide();
that.suggestionsContainer.hide();
that.signalHint(null);
},

Expand All @@ -637,7 +631,7 @@
value = that.getQuery(that.currentValue),
className = that.classes.suggestion,
classSelected = that.classes.selected,
container = $(that.suggestionsContainer),
container = that.suggestionsContainer,
noSuggestionsContainer = $(that.noSuggestionsContainer),
beforeRender = options.beforeRender,
html = '',
Expand Down Expand Up @@ -697,7 +691,7 @@

noSuggestions: function() {
var that = this,
container = $(that.suggestionsContainer),
container = that.suggestionsContainer,
noSuggestionsContainer = $(that.noSuggestionsContainer);

this.adjustContainerWidth();
Expand All @@ -718,7 +712,7 @@
var that = this,
options = that.options,
width,
container = $(that.suggestionsContainer);
container = that.suggestionsContainer;

// If width is auto, adjust width before displaying suggestions,
// because if instance was created before input had width, it will be zero.
Expand Down Expand Up @@ -811,7 +805,7 @@
var that = this,
activeItem,
selected = that.classes.selected,
container = $(that.suggestionsContainer),
container = that.suggestionsContainer,
children = container.find('.' + that.classes.suggestion);

container.find('.' + selected).removeClass(selected);
Expand Down Expand Up @@ -848,7 +842,7 @@
}

if (that.selectedIndex === 0) {
$(that.suggestionsContainer).children().first().removeClass(that.classes.selected);
that.suggestionsContainer.children().first().removeClass(that.classes.selected);
that.selectedIndex = -1;
that.el.val(that.currentValue);
that.findBestHint();
Expand Down Expand Up @@ -882,13 +876,13 @@
heightDelta = $(activeItem).outerHeight();

offsetTop = activeItem.offsetTop;
upperBound = $(that.suggestionsContainer).scrollTop();
upperBound = that.suggestionsContainer.scrollTop();
lowerBound = upperBound + that.options.maxHeight - heightDelta;

if (offsetTop < upperBound) {
$(that.suggestionsContainer).scrollTop(offsetTop);
that.suggestionsContainer.scrollTop(offsetTop);
} else if (offsetTop > lowerBound) {
$(that.suggestionsContainer).scrollTop(offsetTop - that.options.maxHeight + heightDelta);
that.suggestionsContainer.scrollTop(offsetTop - that.options.maxHeight + heightDelta);
}

if (!that.options.preserveInput) {
Expand Down Expand Up @@ -942,7 +936,7 @@
that.el.off('.autocomplete').removeData('autocomplete');
that.disableKillerFn();
$(window).off('resize.autocomplete', that.fixPositionCapture);
$(that.suggestionsContainer).remove();
that.suggestionsContainer.remove();
}
};

Expand Down