Merge pull request #39 from PolymerElements/fix-event

Fix #38
PolymerElements · Aug 13, 2015 · 3b07d67 · 3b07d67
2 parents 63d4c9c + af2a03c
commit 3b07d67
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/paper-scroll-header-panel.html b/paper-scroll-header-panel.html
@@ -480,12 +480,8 @@
     },
 
     _condensesChanged: function() {
-      if (this.condenses) {
-        this._scroll();
-      } else {
-        // reset transform/opacity set on the header
-        this._condenseHeader(null);
-      }
+      this._updateScrollState(this.scroller.scrollTop);
+      this._condenseHeader(null);
     },
 
     _setup: function() {
@@ -558,14 +554,12 @@
       if (this.header) {
         this._updateScrollState(this.scroller.scrollTop);
 
-        if (event) {
-          this.fire('content-scroll', {
-            target: this.scroller
-          },
-          {
-            cancelable: false
-          });
-        }
+        this.fire('content-scroll', {
+          target: this.scroller
+        },
+        {
+          cancelable: false
+        });
       }
     },
 
@@ -588,7 +582,7 @@
         this._setHeaderState(this.HEADER_STATE_INTERPOLATED);
       }
 
-      if (!event || !this.fixed && y !== this._y) {
+      if (!this.fixed && y !== this._y) {
         this._transformHeader(y);
       }