From 69bba7e14b13cd7ae88525af9291939e78b7ad79 Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Sun, 22 Jul 2018 22:11:02 +0300
Subject: [PATCH] fix(angular.element): do not break on `cleanData()` if
 `_data()` returns undefined

This shouldn't happen in supported jQuery versions (2+), but if someone
uses the unsupported 1.x version the app will break. The change that
causes this new behavior was introduced in b7d396b8b.

Even though jQuery 1.x is not supported, it is worth avoiding the
unnecessary breakage (given how simple).

Fixes #16641
---
 src/Angular.js     | 2 +-
 test/jqLiteSpec.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Angular.js b/src/Angular.js
index fef4278ff2b2..da2fb94aed94 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1909,7 +1909,7 @@ function bindJQuery() {
   jqLite.cleanData = function(elems) {
     var events;
     for (var i = 0, elem; (elem = elems[i]) != null; i++) {
-      events = jqLite._data(elem).events;
+      events = (jqLite._data(elem) || {}).events;
       if (events && events.$destroy) {
         jqLite(elem).triggerHandler('$destroy');
       }
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index 5e8bbbfcdc46..14d60900611a 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -501,6 +501,12 @@ describe('jqLite', function() {
       expect(jqLite(c).data('prop')).toBeUndefined();
     });
 
+    it('should not break on cleanData(), if element has no data', function() {
+      var selected = jqLite([a, b, c]);
+      spyOn(jqLite, '_data').and.returnValue(undefined);
+      expect(function() { jqLite.cleanData(selected); }).not.toThrow();
+    });
+
 
     it('should add and remove data on SVGs', function() {
       var svg = jqLite('<svg><rect></rect></svg>');