backbone_extensions 0.0.22 → 0.0.23

data/lib/assets/javascripts/backbone_extensions/delegate_events.js

@@ -4,7 +4,6 @@
     var self = this, subject = tuple[0], eventNames = tuple[1], isJquery = !!_(subject).result('jquery'),
         modelEvents = self._modelCallbacks, context = tuple[2];
     modelEvents.push(tuple);
-
     _(subject && eventNames).each(function(callback, event) {
       _(event.split(' ')).each(function(e) {
         _([callback]).chain().flatten().each(function(c) {
@@ -26,15 +25,19 @@
   function unbindModelEvents() {
     var self = this, modelEvents = self._modelCallbacks;
     _(modelEvents).each(function(tuple) {
-      var subject = tuple[0], events = tuple[1];
-
+      var subject = tuple[0], events = tuple[1], context = tuple[2], isJquery = !!_(subject).result('jquery');
       _(subject && events).each(function(callback, event) {
         _(event.split(' ')).each(function(e) {
           _([callback]).chain().flatten().each(function(c) {
-            if (_(c).isFunction()) {
-              subject.off(e, c);
+            var fn = _(c).isFunction() ? c : self[c];
+            if (isJquery) {
+              if (context) {
+                subject.off(e, context, fn);
+              } else {
+                subject.off(e, fn);
+              }
             } else {
-              subject.off(e, self[c]);
+              subject.off(e, fn);
             }
           });
         });
@@ -59,12 +62,11 @@
         }),
 
         delegateEvents: _(source.prototype.delegateEvents).wrap(function(oldDelegateEvents) {
-          var self = this, args = _(arguments).rest(1);
+          var self = this, args = _(arguments).rest();
 
           if (!args.length) {
             return oldDelegateEvents.call(this);
           }
-
           wrapUndelegateEvents.call(this, function() {
             _(args).chain().toArray().compact().each(function(obj) {
               var arg = _(obj);

data/lib/backbone_extensions/version.rb

@@ -1,3 +1,3 @@
 module BackboneExtensions
-  VERSION = '0.0.22'
+  VERSION = '0.0.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3574570062899009095
+      hash: 4389807345042330580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3574570062899009095
+      hash: 4389807345042330580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21