Skip to content

New option data and some minor bugfixes #12

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

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

New option data and some minor bugfixes #12

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df7a12b
possibility to have id_map assigned to element.data() and not necessa…
Sep 10, 2013
aeab83d
added copyright
Sep 10, 2013
4e88291
cut contents at cursor position, otherwise if you have multiple trigg…
Sep 10, 2013
f9e666c
insert space after selection only if needed and compute the new caret…
Sep 10, 2013
9ad0a62
fix menu keyboard navigation and preload id_map from data() and not f…
Sep 11, 2013
731c6ac
error check
Sep 11, 2013
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
50 changes: 37 additions & 13 deletions jquery-ui.triggeredAutocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/*
* triggeredAutocomplete (jQuery UI autocomplete widget)
* 2012 by Hawkee.com (hawkee@gmail.com)
* 2013 by Augusto Destrero (a.destrero@gmail.com)
*
* Version 1.4.5
*
Expand Down Expand Up @@ -46,10 +47,15 @@
}
});

// Check for the id_map as an attribute. This is for editing.

var id_map_string = this.element.attr('id_map');
if(id_map_string) this.id_map = jQuery.parseJSON(id_map_string);
// Check for the id_map as a data attribute. This is for editing.
try {
var id_map_string = this.element.data(self.options.data);
if (id_map_string && id_map_string != '') {
this.id_map = jQuery.parseJSON(id_map_string);
}
} catch(err) {
this.id_map = new Object();
}

this.ac = $.ui.autocomplete.prototype;
this.ac._create.apply(this, arguments);
Expand All @@ -71,7 +77,13 @@
start = start.substring(0, start.lastIndexOf(self.options.trigger));

var top = self.element.scrollTop();
this.value = start + self.options.trigger+ui.item.label+' ' + end;
var newvalue = start + self.options.trigger + ui.item.label;
if (end.charAt(0) != ' ') {
newvalue += ' ';
}
var newcaretposition = newvalue.length + 1;
newvalue += end;
this.value = newvalue;
self.element.scrollTop(top);

// Create an id map so we can create a hidden version of this string with id's instead of labels.
Expand All @@ -80,13 +92,12 @@
self.updateHidden();

/** Places the caret right after the inserted item. */
var index = start.length + self.options.trigger.length + ui.item.label.length + 2;
if (this.createTextRange) {
var range = this.createTextRange();
range.move('character', index);
range.move('character', newcaretposition);
range.select();
} else if (this.setSelectionRange) {
this.setSelectionRange(index, index);
this.setSelectionRange(newcaretposition, newcaretposition);
}

return false;
Expand Down Expand Up @@ -125,9 +136,9 @@
this.search( null, event );
return;
}
if ( this.menu.first() && /^previous/.test(direction) ||
this.menu.last() && /^next/.test(direction) ) {
this.menu.deactivate();
if ( this.menu.isFirstItem() && /^previous/.test(direction) ||
this.menu.isLastItem() && /^next/.test(direction) ) {
this.menu.disable();
return;
}
this.menu[ direction ]( event );
Expand All @@ -140,18 +151,26 @@
this.contents = contents;
this.cursorPos = cursorPos;

// cut contents at cursor position
contents = contents.substring(0, cursorPos);

// Include the character before the trigger and check that the trigger is not in the middle of a word
// This avoids trying to match in the middle of email addresses when '@' is used as the trigger

var check_contents = contents.substring(contents.lastIndexOf(this.options.trigger) - 1, cursorPos);
var regex = new RegExp('\\B\\'+this.options.trigger+'([\\w\\-]+)');
var only_trigger_regex = new RegExp('\\B\\' + this.options.trigger);

// Close the suggestion list if there's only the trigger
if (check_contents.match(only_trigger_regex)) {
this.close();
}

if (contents.indexOf(this.options.trigger) >= 0 && check_contents.match(regex)) {

// Get the characters following the trigger and before the cursor position.
// Get the contents up to the cursortPos first then get the lastIndexOf the trigger to find the search term.

contents = contents.substring(0, cursorPos);
var term = contents.substring(contents.lastIndexOf(this.options.trigger) + 1, contents.length);

// Only query the server if we have a term and we haven't received a null response.
Expand Down Expand Up @@ -258,7 +277,12 @@
contents = contents.replace(regex, trigger+'['+this.id_map[key]+']');
if(old_contents == contents) delete this.id_map[key];
}
$(this.options.hidden).val(contents);
if (typeof this.options.hidden != 'undefined') {
$(this.options.hidden).val(contents);
}
if (typeof this.options.data != 'undefined') {
this.element.data(this.options.data, this.id_map);
}
this.element.scrollTop(top);
}

Expand Down