update master from gh-pages

tdresser · Jun 25, 2014 · 83828c7 · 83828c7
1 parent 6346b83
commit 83828c7
Show file tree

Hide file tree

Showing 4 changed files with 222 additions and 116 deletions.
diff --git a/baseline.html b/baseline.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, user-scalable=no">
+    <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+    <title>Polymer Pull to Refresh demo</title>
+  </head>
+  <style>
+    html, body, #polymer-p2r-container {
+      margin:0;
+      height:100%;
+    }
+
+    #polymer-p2r-container {
+      overflow:scroll;
+    }
+
+    .row {
+      height: 55px;
+      width: 100%;
+    }
+
+    .even {
+      background-color: lightblue;
+    }
+
+    .odd {
+      background-color: white;
+    }
+
+  </style>
+  <script>
+    window.onload = function() {
+      var container = document.getElementById("polymer-p2r-container");
+      document.addEventListener("touchmove", function() {
+        container.style.webkitTransform = 'translate3d(0, 0, 0)';
+      });
+    };
+  </script>
+  <body>
+    <div id="polymer-p2r-container">
+      <div class="p2rheader">
+        <div class="header-div">
+        </div>
+      </div>
+      <div class="content">
+        <div class='row odd'>1</div>
+        <div class='row even'>2</div>
+        <div class='row odd'>3</div>
+        <div class='row even'>4</div>
+        <div class='row odd'>5</div>
+        <div class='row even'>6</div>
+        <div class='row odd'>7</div>
+        <div class='row even'>8</div>
+        <div class='row odd'>9</div>
+        <div class='row even'>10</div>
+        <div class='row odd'>11</div>
+        <div class='row even'>12</div>
+        <div class='row odd'>13</div>
+        <div class='row even'>14</div>
+        <div class='row odd'>15</div>
+        <div class='row even'>16</div>
+        <div class='row odd'>17</div>
+        <div class='row even'>18</div>
+        <div class='row odd'>19</div>
+        <div class='row even'>20</div>
+        <div class='row odd'>21</div>
+        <div class='row even'>22</div>
+        <div class='row odd'>23</div>
+        <div class='row even'>24</div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/index.html b/index.html
@@ -7,14 +7,14 @@
     <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
     <title>Polymer Pull to Refresh demo</title>
   </head>
+
   <style>
     html, body, polymer-p2r {
       height:100%;
       overflow:hidden;
       margin:0;
     }
 
-
     polymer-p2r[unresolved] {
       opacity: 0;
       transition: opacity 5s;

diff --git a/polymer-p2r.html b/polymer-p2r.html
@@ -3,26 +3,28 @@
 <polymer-element name="polymer-p2r">
   <template>
     <style>
+     :host {
+       display:block;
+     }
+
      :host * {
        margin:0;
        padding:0;
      }
 
-     :host {
-       display:block;
-     }
-
+/* Remove for document scrolling */
      :host #scroller {
        height:100%;
        width:100%;
        display:block;
        overflow-y:scroll;
+       -webkit-overflow-scrolling: touch;
      }
 
+
      :host #scrollcontent {
        position: relative;
        width: 100%;
-       /* Offset p2r height. TODO: pull this from the header object */
        top: -800px;
        margin-bottom:-800px;
      }
@@ -32,6 +34,7 @@
        z-index:-1;
      }
     </style>
+<!-- Remove "scroller" for document scrolling -->
     <div id="scroller">
       <div id="p2r">
         <content select=".p2rheader"></content>