fix(merge): ensure that jqlite->jqlite and DOM->DOM

Previously we were wrapping DOM elements into jqlite objects when cloning and vice versa. Fixes #12286 (comment)
angular · Nov 2, 2015 · 75292a6 · gkalpak · Nov 2, 2015 · petebacondarwin
1 parent 4ff6c85
commit 75292a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Angular.js b/src/Angular.js
@@ -360,8 +360,10 @@ function baseExtend(dst, objs, deep) {
           dst[key] = new Date(src.valueOf());
         } else if (isRegExp(src)) {
           dst[key] = new RegExp(src);
+        } else if (src.nodeName) {
+          dst[key] = src.cloneNode(true);
         } else if (isElement(src)) {
-          dst[key] = src[0] ? jqLite(src).clone()[0] : jqLite(src).clone();
+          dst[key] = jqLite(src).clone();
         } else {
           if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
           baseExtend(dst[key], [src], true);

diff --git a/test/AngularSpec.js b/test/AngularSpec.js
@@ -649,7 +649,9 @@ describe('angular', function() {
       expect(dst.jqObject).not.toBe(src.jqObject);
 
       expect(isElement(dst.element)).toBeTruthy();
+      expect(jqLite(dst.element)).not.toBe(dst.element); // i.e it is a DOM element
       expect(isElement(dst.jqObject)).toBeTruthy();
+      expect(jqLite(dst.jqObject)).toBe(dst.jqObject); // i.e it is a jqLite/jquery object
     });
   });