Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3253)

Unified Diff: chrome/browser/resources/ntp4/card_slider.js

Issue 7792013: mac: Completely disable history swiping on the ntp. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/ntp4/card_slider.js
diff --git a/chrome/browser/resources/ntp4/card_slider.js b/chrome/browser/resources/ntp4/card_slider.js
index 0370395d216b4e3326cff73f35f27014c5c4576e..e20163b0aa52eb8f60777d63cc013604bcf79d40 100644
--- a/chrome/browser/resources/ntp4/card_slider.js
+++ b/chrome/browser/resources/ntp4/card_slider.js
@@ -221,15 +221,8 @@ var CardSlider = (function() {
if (e.wheelDeltaX == 0)
return;
- var preventDefault = true;
- // If the horizontal scroll didn't change cards (on the far right of
- // the NTP), let the browser take a shot at the event as well.
- if (this.currentCard === 0 && this.mouseWheelScrollAmount_ > 0)
- preventDefault = false;
- if (this.currentCard === this.cards_.length - 1 &&
- this.mouseWheelScrollAmount_ < 0) {
- preventDefault = false;
- }
+ // Prevent OS X 10.7+ history swiping on the NTP.
+ e.preventDefault();
// Mac value feels ok with multitouch trackpads and magic mice
// (with physical scrollwheel, too), but not so great with logitech
@@ -259,9 +252,6 @@ var CardSlider = (function() {
this.scrollClearTimeout_ =
setTimeout(this.clearMouseWheelScroll_.bind(this), 500);
}
-
- if (preventDefault)
- e.preventDefault();
},
/**
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698