Skip to content
This repository has been archived by the owner on Jul 2, 2018. It is now read-only.

Add support for jsonp #75

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
27 changes: 21 additions & 6 deletions src/jquery.autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
queryParamName: 'q',
extraParams: {},
remoteDataType: false,
jsonpCallback: false,
lineSeparator: '\n',
cellSeparator: '|',
minChars: 2,
Expand Down Expand Up @@ -592,7 +593,7 @@
callback(data);
} else {
var self = this;
var dataType = self.options.remoteDataType === 'json' ? 'json' : 'text';

var ajaxCallback = function(data) {
var parsed = false;
if (data !== false) {
Expand All @@ -603,7 +604,7 @@
callback(parsed);
};
this.dom.$elem.addClass(this.options.loadingClass);
$.ajax({
var ajaxOptions = {
url: this.makeUrl(filter),
success: ajaxCallback,
error: function(jqXHR, textStatus, errorThrown) {
Expand All @@ -612,9 +613,23 @@
} else {
ajaxCallback(false);
}
},
dataType: dataType
});
}
}

// extend ajaxOptions with dataType and jsonpCallback if needed
// default dataType = "text"
var dataType = self.options.remoteDataType;
if (dataType === 'json') {
ajaxOptions['dataType'] = dataType;
} else if (dataType === 'jsonp') {
ajaxOptions['jsonpCallback'] = (self.options.jsonpCallback) ? self.options.jsonpCallback :
'jsonpCallback';
ajaxOptions['dataType'] = dataType;
} else {
ajaxOptions['dataType'] = 'text';
}

$.ajax(ajaxOptions);
}
};

Expand Down Expand Up @@ -665,7 +680,7 @@
$.Autocompleter.prototype.parseRemoteData = function(remoteData) {
var remoteDataType;
var data = remoteData;
if (this.options.remoteDataType === 'json') {
if (this.options.remoteDataType === 'json' || this.options.remoteDataType === 'jsonp') {
remoteDataType = typeof(remoteData);
switch (remoteDataType) {
case 'object':
Expand Down