Merge branch 'master' of [email protected]:PolymerLabs/app-layout.git

PolymerElements · Feb 24, 2016 · 6191c55 · 6191c55
2 parents 313c8fc + 488a475
commit 6191c55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/app-header-layout/app-header-layout.html b/app-header-layout/app-header-layout.html
@@ -85,6 +85,7 @@
     #contentContainer {
       position: relative;
       overflow-y: hidden;
+      @apply(--app-header-layout-content);
     }
 
   </style>
@@ -146,9 +147,10 @@
        * @method resetLayout
        */
       resetLayout: function() {
+        this._updateScroller();
         this.debounce('_resetLayout', function() {
           this._updateContentPosition();
-          this._updateScroller();
+          this._updateFixedNodesPosition();
         });
       },
 
@@ -190,7 +192,6 @@
         var header = this.header;
         if (header) {
           header.scroller = this.hasScrollingRegion ? this.$.contentContainer : window;
-          this._updateFixedNodesPosition();
         }
       },
 

diff --git a/app-header-layout/test/app-header-layout.html b/app-header-layout/test/app-header-layout.html
@@ -76,17 +76,9 @@
         assert.equal(header.scroller, window);
       });
 
-      test('scrolling region', function(done) {
+      test('scrolling region', function() {
         headerLayout.hasScrollingRegion = true;
-
-        window.setTimeout(function() {
-          /**
-           * Use window.toString() to avoid potential comparisons between window with itself
-           * which causes a misleading "JSON.stringify cannot serialize cyclic structures" error.
-           */
-          assert.notEqual(header.scroller.toString(), window.toString());
-          done();
-        }, 100);
+        assert.isTrue(header.scroller !== window, 'scroller should not point to the document element');        
       });
 
     });