Merge remote-tracking branch 'cronon/master'

webcomponents · Apr 4, 2017 · 5f4ea0a · 5f4ea0a
2 parents 79445c1 + 07a88c3
commit 5f4ea0a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/custom-elements.min.js b/custom-elements.min.js
diff --git a/custom-elements.min.js.map b/custom-elements.min.js.map
diff --git a/src/Patch/Element.js b/src/Patch/Element.js
@@ -131,9 +131,7 @@ export default function(internals) {
       const oldValue = Native.Element_getAttribute.call(this, name);
       Native.Element_setAttribute.call(this, name, newValue);
       newValue = Native.Element_getAttribute.call(this, name);
-      if (oldValue !== newValue) {
-        internals.attributeChangedCallback(this, name, oldValue, newValue, null);
-      }
+      internals.attributeChangedCallback(this, name, oldValue, newValue, null);
     });
 
   Utilities.setPropertyUnchecked(Element.prototype, 'setAttributeNS',
@@ -152,9 +150,7 @@ export default function(internals) {
       const oldValue = Native.Element_getAttributeNS.call(this, namespace, name);
       Native.Element_setAttributeNS.call(this, namespace, name, newValue);
       newValue = Native.Element_getAttributeNS.call(this, namespace, name);
-      if (oldValue !== newValue) {
-        internals.attributeChangedCallback(this, name, oldValue, newValue, namespace);
-      }
+      internals.attributeChangedCallback(this, name, oldValue, newValue, namespace);
     });
 
   Utilities.setPropertyUnchecked(Element.prototype, 'removeAttribute',

diff --git a/tests/html/Element/setAttribute.html b/tests/html/Element/setAttribute.html
@@ -81,7 +81,7 @@
     defineWithLocalName(localName, ['attr']);
   });
 
-  test('Setting an observed attribute to its current value does not trigger a callback.', function() {
+  test('Setting an observed attribute to its current value does trigger a callback.', function() {
     const element = document.createElement(localName);
 
     assert.equal(element.attrCallbackArgs.length, 0);
@@ -93,7 +93,7 @@
 
     element.setAttribute('attr', 'abc');
 
-    assert.equal(element.attrCallbackArgs.length, 1);
+    assert.equal(element.attrCallbackArgs.length, 2);
   });
 
   test('Setting an observed attribute to a different value triggers a callback.', function() {

diff --git a/tests/html/Element/setAttributeNS.html b/tests/html/Element/setAttributeNS.html
@@ -86,7 +86,7 @@
     defineWithLocalName(localName, ['attr']);
   });
 
-  test('Setting an observed attribute to its current value does not trigger a callback.', function() {
+  test('Setting an observed attribute to its current value triggers a callback.', function() {
     const element = document.createElement(localName);
 
     assert.equal(element.attrCallbackArgs.length, 0);
@@ -98,7 +98,8 @@
 
     element.setAttributeNS('ns', 'attr', 'abc');
 
-    assert.equal(element.attrCallbackArgs.length, 1);
+    assert.equal(element.attrCallbackArgs.length, 2);
+    assert.deepEqual(element.attrCallbackArgs[0], ['attr', NON_EXISTANT_VALUE, 'abc', 'ns']);
   });
 
   test('Setting an observed attribute to a different value triggers a callback.', function() {

diff --git a/tests/js/reactions.js b/tests/js/reactions.js
@@ -240,6 +240,26 @@ suite('Custom Element Reactions', function() {
       assert.equal(changed[0].newValue, 'test1', 'newValue');
     });
 
+    test('called even if attribute value hasn\'t changed', function () {
+      var calls = 0;
+      class XBoo extends HTMLElement {
+        static get observedAttributes () {
+          return ['foo'];
+        }
+        attributeChangedCallback(name, oldValue, newValue) {
+          calls += 1;
+        }
+      }
+      var element = document.createElement('x-boo-at2');
+
+      customElements.define('x-boo-at2', XBoo);
+      work.appendChild(element);
+      element.setAttribute('foo', 'foo');
+      element.setAttribute('foo', 'foo');
+
+      assert.equal(calls, 2);
+    })
+
   });
 
   suite('connectedCallback', function() {