From 92e4f98a31340455cfd61720bd8b1511be17df86 Mon Sep 17 00:00:00 2001
From: Jeff Whelpley <jeff@gethuman.com>
Date: Wed, 14 May 2014 10:18:17 -0400
Subject: [PATCH] Do not merge attrs that are the same

---
 src/ng/compile.js      |  2 +-
 test/ng/compileSpec.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/ng/compile.js b/src/ng/compile.js
index cfa72d972e67..1aae79b586bc 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -1652,7 +1652,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       // reapply the old attributes to the new element
       forEach(dst, function(value, key) {
         if (key.charAt(0) != '$') {
-          if (src[key]) {
+          if (src[key] && src[key] !== value) {
             value += (key === 'style' ? ';' : ' ') + src[key];
           }
           dst.$set(key, value, true, srcAttr[key]);
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index b3af196f3bb7..3f0b1be260b3 100755
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -492,6 +492,15 @@ describe('$compile', function() {
               expect(element).toBe(attr.$$element);
             }
           }));
+          directive('nomerge', valueFn({
+            restrict: 'CAM',
+            replace: true,
+            template: '<div class="log" id="myid" high-log>No Merge!</div>',
+            compile: function(element, attr) {
+              attr.$set('compiled', 'COMPILED');
+              expect(element).toBe(attr.$$element);
+            }
+          }));
           directive('append', valueFn({
             restrict: 'CAM',
             template: '<div class="log" style="width: 10px" high-log>Append!</div>',
@@ -596,6 +605,16 @@ describe('$compile', function() {
           expect(div.attr('high-log')).toEqual('');
         }));
 
+        it('should not merge attributes if they are the same', inject(function($compile, $rootScope) {
+          element = $compile(
+            '<div><div nomerge class="medium-log" id="myid"></div><div>')
+            ($rootScope);
+          var div = element.find('div');
+          expect(div.hasClass('medium-log')).toBe(true);
+          expect(div.hasClass('log')).toBe(true);
+          expect(div.attr('id')).toEqual('myid');
+        }));
+
         it('should prevent multiple templates per element', inject(function($compile) {
           try {
             $compile('<div><span replace class="replace"></span></div>');