Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* Remove some debug code

* Rename global to universal
  • Loading branch information...
commit 21a8fef510d99f039d8dca92b419223389484690 1 parent c40b067
@joehewitt authored
Showing with 8 additions and 9 deletions.
  1. +7 −8 scrollability.js
  2. +1 −1  static/examples/tableview.html
View
15 scrollability.js
@@ -4,11 +4,11 @@
// var logs = [];
-function D() {
- var args = []; args.push.apply(args, arguments);
- console.log(args.join(' '));
- // logs.push(args.join(' '));
-}
+// function D() {
+// var args = []; args.push.apply(args, arguments);
+// console.log(args.join(' '));
+// // logs.push(args.join(' '));
+// }
// window.showLog = function() {
// document.querySelector('.scrollable').innerHTML = logs.join('<br>');
@@ -73,7 +73,6 @@ var directions = {
'vertical': createYDirection
};
-exports.globalScrolling = false;
exports.directions = directions;
exports.flashIndicators = function() {
@@ -96,7 +95,7 @@ function onTouchStart(event) {
touchMoved = false;
touchAnimators = getTouchAnimators(event.target, touchX, touchY, event.timeStamp);
- if (!touchAnimators.length && !exports.globalScrolling) {
+ if (!touchAnimators.length) {
return true;
}
@@ -497,7 +496,7 @@ function getTouchAnimators(node, touchX, touchY, startTime) {
findAnimators(node, animators, touchX, touchY, startTime);
// Get universally scrollable elements
- var candidates = document.querySelectorAll('.scrollable.global');
+ var candidates = document.querySelectorAll('.scrollable.universal');
for (var j = 0; j < candidates.length; ++j) {
findAnimators(candidates[j], animators, touchX, touchY, startTime);
}
View
2  static/examples/tableview.html
@@ -153,7 +153,7 @@
<div class="bar top" onclick="location.reload(true)">Scrollability Demo</div>
<div class="bar bottom" onclick="showLog()">Footer</div>
<div id="container">
- <div id="page" class="scrollable vertical"></div>
+ <div id="page" class="scrollable vertical universal"></div>
</div>
</body>
</html>
Please sign in to comment.
Something went wrong with that request. Please try again.