Merge pull request #1186 from jharding/970-null-destroy

Prevent reference errors after destroy

src/typeahead/dataset.js

@@ -291,7 +291,8 @@ var Dataset = (function() {
     },
 
     destroy: function destroy() {
-      this.$el = null;
+      // #970
+      this.$el = $('<div>');
     }
   });
 

src/typeahead/input.js

@@ -296,7 +296,8 @@ var Input = (function() {
       this.$input.off('.tt');
       this.$overflowHelper.remove();
 
-      this.$hint = this.$input = this.$overflowHelper = null;
+      // #970
+      this.$hint = this.$input = this.$overflowHelper = $('<div>');
     }
   });
 

src/typeahead/menu.js

@@ -204,7 +204,8 @@ var Menu = (function() {
     destroy: function destroy() {
       this.$node.off('.tt');
 
-      this.$node = null;
+      // #970
+      this.$node = $('<div>');
 
       _.each(this.datasets, destroyDataset);
 

test/typeahead/dataset_spec.js

@@ -421,10 +421,11 @@ describe('Dataset', function() {
   });
 
   describe('#destroy', function() {
-    it('should null out the reference to the dataset element', function() {
-      this.dataset.destroy();
+    it('should set dataset element to dummy element', function() {
+      var $prevEl = this.dataset.$el;
 
-      expect(this.dataset.$el).toBeNull();
+      this.dataset.destroy();
+      expect(this.dataset.$el).not.toBe($prevEl);
     });
   });
 

test/typeahead/input_spec.js

@@ -475,12 +475,18 @@ describe('Input', function() {
       expect($input.off).toHaveBeenCalledWith('.tt');
     });
 
-    it('should null out its reference to DOM elements', function() {
+    it('should set references to DOM elements to dummy element', function() {
+      var $hint, $input, $overflowHelper;
+
+      $hint = this.view.$hint;
+      $input = this.view.$input;
+      $overflowHelper = this.view.$overflowHelper;
+
       this.view.destroy();
 
-      expect(this.view.$hint).toBeNull();
-      expect(this.view.$input).toBeNull();
-      expect(this.view.$overflowHelper).toBeNull();
+      expect(this.view.$hint).not.toBe($hint);
+      expect(this.view.$input).not.toBe($input);
+      expect(this.view.$overflowHelper).not.toBe($overflowHelper);
     });
   });
 

test/typeahead/results_spec.js

@@ -322,9 +322,11 @@ describe('Menu', function() {
       expect(this.dataset.destroy).toHaveBeenCalled();
     });
 
-    it('should null out its reference to the node element', function() {
+    it('should set node element to dummy element', function() {
+      var $node = this.view.$node;
+
       this.view.destroy();
-      expect(this.view.$node).toBeNull();
+      expect(this.view.$node).not.toBe($node);
     });
   });
 });