Merge branch 'develop'

FreCap · Apr 24, 2013 · 6e055c1 · 6e055c1
2 parents 9f62319 + d48616a
commit 6e055c1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/spec/autocompleteBehavior.js b/spec/autocompleteBehavior.js
@@ -385,4 +385,40 @@ describe('Autocomplete', function () {
 
         expect(instance instanceof $.Autocomplete).toBe(true);
     });
+
+    it('Should construct serviceUrl via callback function.', function () {
+        var input = $(document.createElement('input')),
+            dynamicUrl,
+            data;
+
+        input.autocomplete({
+            ignoreParams: true,
+            serviceUrl: function (query) {
+                return '/dynamic-url/' + encodeURIComponent(query).replace(/%20/g, "+");
+            }
+        });
+
+        $.mockjax({
+            url: '/dynamic-url/*',
+            responseTime: 5,
+            response: function (settings) {
+                dynamicUrl = settings.url;
+                data = settings.data;
+                var response = {
+                    suggestions: []
+                };
+                this.responseText = JSON.stringify(response);
+            }
+        });
+
+        input.val('Hello World');
+        input.autocomplete().onValueChange();
+
+        waits(10);
+
+        runs(function () {
+            expect(dynamicUrl).toBe('/dynamic-url/Hello+World');
+            expect(data).toBeFalsy();
+        });
+    });
 });
diff --git a/src/jquery.autocomplete.js b/src/jquery.autocomplete.js
@@ -381,7 +381,8 @@
         getSuggestions: function (q) {
             var response,
                 that = this,
-                options = that.options;
+                options = that.options,
+                serviceUrl = options.serviceUrl;
 
             response = that.isLocal ? that.getSuggestionsLocal(q) : that.cachedResponse[q];
 
@@ -390,10 +391,15 @@
                 that.suggest();
             } else if (!that.isBadQuery(q)) {
                 options.params[options.paramName] = q;
-                options.onSearchStart.call(that.element, options.params);
+                if (options.onSearchStart.call(that.element, options.params) === false) {
+                    return;
+                }
+                if ($.isFunction(options.serviceUrl)) {
+                    serviceUrl = options.serviceUrl.call(that.element, q);
+                }
                 $.ajax({
-                    url: options.serviceUrl,
-                    data: options.params,
+                    url: serviceUrl,
+                    data: options.ignoreParams ? null : options.params,
                     type: options.type,
                     dataType: options.dataType
                 }).done(function (data) {