fix(jqLite): have same expando format as jQuery

2 files changed, 47 insertions, 13 deletions

diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 88946ab9..469df91e 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -353,6 +353,18 @@ describe('ngMock', function() {
       return keys.sort();
     }
 
+    function browserTrigger(element, eventType) {
+      element = element[0];
+      if (document.createEvent) {
+        var event = document.createEvent('MouseEvents');
+        event.initMouseEvent(eventType, true, true, window, 0, 0, 0, 0, 0, false, false,
+          false, false, 0, element);
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent('on' + eventType);
+      }
+    }
+
     it('should remove data', function() {
       expect(angular.element.cache).toEqual({});
       var div = angular.element('<div></div>');
@@ -364,17 +376,29 @@ describe('ngMock', function() {
 
     it('should deregister event handlers', function() {
       expect(keys(angular.element.cache)).toEqual([]);
-
+      var log = '';
       var div = angular.element('<div></div>');
 
-      div.bind('click', angular.noop);
-      div.bind('mousemove', angular.noop);
-      div.data('some', 'data');
-      expect(keys(angular.element.cache).length).toBe(1);
+      // crazy IE9 requires div to be connected to render DOM for click event to work
+      // mousemove works even when not connected. This is a heisen-bug since stepping
+      // through the code makes the test pass. Viva IE!!!
+      angular.element(document.body).append(div)
+
+      div.bind('click', function() { log += 'click1;'});
+      div.bind('click', function() { log += 'click2;'});
+      div.bind('mousemove', function() { log += 'mousemove;'});
+
+      browserTrigger(div, 'click');
+      browserTrigger(div, 'mousemove');
+      expect(log).toEqual('click1;click2;mousemove;');
+      log = '';
 
       angular.mock.clearDataCache();
+
+      browserTrigger(div, 'click');
+      browserTrigger(div, 'mousemove');
+      expect(log).toEqual('');
       expect(keys(angular.element.cache)).toEqual([]);
-      expect(div.data('some')).toBeUndefined();
 
       div.remove();
     });
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index f033dda2..ac22c72c 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -40,9 +40,14 @@ afterEach(function() {
 
   // complain about uncleared jqCache references
   var count = 0;
-  forEachSorted(jqCache, function(value, key){
-    count ++;
-    forEach(value, function(value, key){
+
+  // This line should be enabled as soon as this bug is fixed: http://bugs.jquery.com/ticket/11775
+  //var cache = jqLite.cache;
+  var cache = JQLite.cache;
+
+  forEachSorted(cache, function(expando, key){
+    forEach(expando.data, function(value, key){
+      count ++;
       if (value.$element) {
         dump('LEAK', key, value.$id, sortedHtml(value.$element));
       } else {
@@ -57,20 +62,25 @@ afterEach(function() {
 
 
 function dealoc(obj) {
+  var jqCache = jqLite.cache;
   if (obj) {
     if (isElement(obj)) {
-      var element = obj;
-      if (element.nodeName) element = jqLite(element);
-      if (element.dealoc) element.dealoc();
+      cleanup(jqLite(obj));
     } else {
       for(var key in jqCache) {
         var value = jqCache[key];
-        if (value.$scope == obj) {
+        if (value.data && value.data.$scope == obj) {
           delete jqCache[key];
         }
       }
     }
+  }
 
+  function cleanup(element) {
+    element.unbind().removeData();
+    for ( var i = 0, children = element.children() || []; i < children.length; i++) {
+      cleanup(jqLite(children[i]));
+    }
   }
 }