Merge pull request #80 from PolymerElements/fix-raised

set elevation like the read-only property it is
PolymerElements · Dec 9, 2015 · f2a3c2c · f2a3c2c
2 parents 53d8338 + b65955e
commit f2a3c2c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/paper-button.html b/paper-button.html
@@ -154,7 +154,7 @@
 
     _calculateElevation: function() {
       if (!this.raised) {
-        this.elevation = 0;
+        this._setElevation(0);
       } else {
         Polymer.PaperButtonBehaviorImpl._calculateElevation.apply(this);
       }

diff --git a/test/paper-button.html b/test/paper-button.html
@@ -19,7 +19,7 @@
   <script src="../../iron-test-helpers/mock-interactions.js"></script>
 
   <link rel="import" href="../paper-button.html">
-  
+
 </head>
 <body>
 
@@ -52,6 +52,22 @@
         }, 1);
       });
 
+      test('can be unraised after being raised imperatively', function(done) {
+        button.raised = true;
+        expect(button.hasAttribute('raised')).to.be.eql(true);
+
+        Polymer.Base.async(function() {
+          expect(button.elevation).to.be.eql(1);
+
+          button.raised = false;
+          expect(button.hasAttribute('raised')).to.be.eql(false);
+          Polymer.Base.async(function() {
+            expect(button.elevation).to.be.eql(0);
+            done();
+          }, 1);
+        }, 1);
+      });
+
       test('can be disabled imperatively', function() {
         button.disabled = true;
         expect(button.getAttribute('aria-disabled')).to.be.eql('true');