Skip to content

Commit

Permalink
* Remove some debug code
Browse files Browse the repository at this point in the history
* Rename global to universal
  • Loading branch information
joehewitt committed Sep 18, 2011
1 parent c40b067 commit 21a8fef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions scrollability.js
Expand Up @@ -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>');
Expand Down Expand Up @@ -73,7 +73,6 @@ var directions = {
'vertical': createYDirection
};

exports.globalScrolling = false;
exports.directions = directions;

exports.flashIndicators = function() {
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion static/examples/tableview.html
Expand Up @@ -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>

0 comments on commit 21a8fef

Please sign in to comment.