perf(merge): remove unnecessary wrapping of jqLite element

Fixes 75292a6#commitcomment-14137538
angular · Nov 3, 2015 · 2e39c75 · 2e39c75
1 parent fe11265
commit 2e39c75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/protractor-conf.js b/protractor-conf.js
@@ -9,7 +9,7 @@ config.specs = [
 ];
 
 config.capabilities = {
-  browserName: 'chrome'
+  browserName: 'firefox'
 };
 
 exports.config = config;
diff --git a/src/Angular.js b/src/Angular.js
@@ -363,7 +363,7 @@ function baseExtend(dst, objs, deep) {
         } else if (src.nodeName) {
           dst[key] = src.cloneNode(true);
         } else if (isElement(src)) {
-          dst[key] = jqLite(src).clone();
+          dst[key] = 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
@@ -639,8 +639,10 @@ describe('angular', function() {
 
 
     it('should copy(clone) elements', function() {
-      var src = { element: document.createElement('div'),
-        jqObject: jqLite("<p><span>s1</span><span>s2</span></p>").find("span") };
+      var src = {
+        element: document.createElement('div'),
+        jqObject: jqLite('<p><span>s1</span><span>s2</span></p>').find('span')
+      };
       var dst = {};
 
       merge(dst, src);
@@ -651,7 +653,7 @@ describe('angular', function() {
       expect(isElement(dst.element)).toBeTruthy();
       expect(dst.element.nodeName).toBeDefined(); // i.e it is a DOM element
       expect(isElement(dst.jqObject)).toBeTruthy();
-      expect(dst.jqObject.nodeName).toBeUndefined(dst.jqObject); // i.e it is a jqLite/jquery object
+      expect(dst.jqObject.nodeName).toBeUndefined(); // i.e it is a jqLite/jQuery object
     });
   });