Properly unbind events on destroy

YPCrumble · Jan 25, 2014 · 69078cc · 69078cc
1 parent d7ab1a7
commit 69078cc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.3
+0.2.4
diff --git a/image-picker/image-picker.js b/image-picker/image-picker.js
@@ -1,7 +1,7 @@
 // Image Picker
 // by Rodrigo Vera
 //
-// Version 0.2.3
+// Version 0.2.4
 // Full source at https://github.com/rvera/image-picker
 // MIT License, https://github.com/rvera/image-picker/blob/master/LICENSE
 // Generated by CoffeeScript 1.4.0
@@ -63,7 +63,14 @@
     }
 
     ImagePicker.prototype.destroy = function() {
+      var option, _i, _len, _ref;
+      _ref = this.picker_options;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        option = _ref[_i];
+        option.destroy();
+      }
       this.picker.remove();
+      this.select.unbind("change");
       this.select.removeData("picker");
       return this.select.show();
     };
@@ -212,6 +219,10 @@
       this.create_node();
     }
 
+    ImagePickerOption.prototype.destroy = function() {
+      return this.node.find(".thumbnail").unbind();
+    };
+
     ImagePickerOption.prototype.has_image = function() {
       return this.option.data("img-src") != null;
     };

diff --git a/image-picker/image-picker.min.js b/image-picker/image-picker.min.js
diff --git a/source/coffee/image-picker.coffee b/source/coffee/image-picker.coffee
@@ -36,7 +36,10 @@ class ImagePicker
     @build_and_append_picker()
 
   destroy: ->
+    for option in @picker_options
+      option.destroy()
     @picker.remove()
+    @select.unbind("change")
     @select.removeData "picker"
     @select.show()
 
@@ -114,6 +117,9 @@ class ImagePickerOption
     @option = jQuery(option_element)
     @create_node()
 
+  destroy: ->
+    @node.find(".thumbnail").unbind()
+
   has_image: () ->
     @option.data("img-src")?