[#2807] Fix an issue in the autocomplete module

Turns out that select2 calls query when loading the page. Now we check that we have a valid object. Updated unit tests to reflect this.
ckan · Aug 6, 2012 · 9a6d0be · 9a6d0be
1 parent 38f824b
commit 9a6d0be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ckan/public/base/javascript/modules/autocomplete.js b/ckan/public/base/javascript/modules/autocomplete.js
@@ -228,7 +228,9 @@ this.ckan.module('autocomplete', function (jQuery, _) {
      * Returns nothing.
      */
     _onQuery: function (options) {
-      this.lookup(options.term, options.callback);
+      if (options) {
+        this.lookup(options.term, options.callback);
+      }
     },
 
     /* Called when a key is pressed.  If the key is a comma we block it and

diff --git a/ckan/public/base/test/spec/modules/autocomplete.spec.js b/ckan/public/base/test/spec/modules/autocomplete.spec.js
@@ -272,6 +272,12 @@ describe('ckan.modules.AutocompleteModule()', function () {
       assert.called(target);
       assert.calledWith(target, 'term', 'callback');
     });
+
+    it('should do nothing if there is no options object', function () {
+      var target = sinon.stub(this.module, 'lookup');
+      this.module._onQuery();
+      assert.notCalled(target);
+    });
   });
 
   describe('._onKeydown(event)', function () {