Transparently unroll wrapped fns for removeEventListener

Author: benvinegar

src/raven.js

@@ -222,6 +222,11 @@ Raven.prototype = {
             return func;
         }
 
+        // If this has already been wrapped in the past, return that
+        if (func.__wrapper__){
+            return func.__wrapper__;
+        }
+
         function wrapped() {
             var args = [], i = arguments.length,
                 deep = !options || options && options.deep !== false;
@@ -246,6 +251,8 @@ Raven.prototype = {
                 wrapped[property] = func[property];
             }
         }
+        func.__wrapper__ = wrapped;
+
         wrapped.prototype = func.prototype;
 
         // Signal that this function has been wrapped already
@@ -584,10 +591,16 @@ Raven.prototype = {
                     return function (evt, fn, capture, secure) { // preserve arity
                         try {
                             if (fn && fn.handleEvent) {
-                                fn.handleEvent = self.wrap(fn.handleEvent, {eventHandler: true});
+                                fn.handleEvent = self.wrap(fn.handleEvent);
                             }
                         } catch (err) {} // can sometimes get 'Permission denied to access property "handle Event'
-                        return orig.call(this, evt, self.wrap(fn, {eventHandler: true}), capture, secure);
+                        return orig.call(this, evt, self.wrap(fn), capture, secure);
+                    };
+                });
+                fill(proto, 'removeEventListener', function (orig) {
+                    return function (evt, fn, capture, secure) {
+                        fn = fn && (fn.__wrapper__ ? fn.__wrapper__ : fn);
+                        return orig.call(this, evt, fn, capture, secure);
                     };
                 });
             }

test/integration/test.js

@@ -125,7 +125,6 @@ describe('integration', function () {
                         foo();
                     }, false);
 
-                    // use setTimeout to "normalize" stack origin
                     var evt;
                     if (document.createEvent) {
                         evt = document.createEvent('MouseEvents');
@@ -142,6 +141,35 @@ describe('integration', function () {
             );
         });
 
+        it('should transparently remove event listeners from wrapped functions', function (done) {
+            var iframe = this.iframe;
+
+            iframeExecute(iframe, done,
+              function () {
+                  setTimeout(done);
+
+                  var div = document.createElement('div');
+                  document.body.appendChild(div);
+                  var fooFn = function () { foo(); };
+                  div.addEventListener('click', fooFn, false);
+                  div.removeEventListener('click', fooFn);
+
+                  var evt;
+                  if (document.createEvent) {
+                      evt = document.createEvent('MouseEvents');
+                      evt.initEvent('click', true, false);
+                      div.dispatchEvent(evt);
+                  } else if(document.createEventObject) {
+                      div.fireEvent('onclick');
+                  }
+              },
+              function () {
+                  var ravenData = iframe.contentWindow.ravenData;
+                  assert.equal(ravenData, null); // should never trigger error
+              }
+            );
+        });
+
         it('should capture exceptions inside setTimeout', function (done) {
             var iframe = this.iframe;