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

Unified Diff: chrome/browser/resources/shared/js/cr/ui/card_slider.js

Issue 8775024: Fix NTP not to slide with mouse (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't include tweak to enable Xinput2 Created 9 years, 1 month 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
Index: chrome/browser/resources/shared/js/cr/ui/card_slider.js
diff --git a/chrome/browser/resources/shared/js/cr/ui/card_slider.js b/chrome/browser/resources/shared/js/cr/ui/card_slider.js
index 1dc4bf6cf47a9df1f4170b76bb75e1278bcf0520..62aca5e384b5ba1b6d3b1292588aa1c49276da21 100644
--- a/chrome/browser/resources/shared/js/cr/ui/card_slider.js
+++ b/chrome/browser/resources/shared/js/cr/ui/card_slider.js
@@ -133,21 +133,22 @@ cr.define('cr.ui', function() {
this.onMouseWheel_.bind(this));
// Also support touch events in case a touch screen happens to be
- // available. Note that we could check cr.isTouchOptimized here, but
- // in general sites should just be listening for touch events without
- // trying to determine in advance if they may be supported (eg. a touch
- // screen can always be plugged in after a page has loaded).
- var TouchHandler = cr.ui.TouchHandler;
- this.container_.addEventListener(TouchHandler.EventType.TOUCH_START,
- this.onTouchStart_.bind(this));
- this.container_.addEventListener(TouchHandler.EventType.DRAG_START,
- this.onDragStart_.bind(this));
- this.container_.addEventListener(TouchHandler.EventType.DRAG_MOVE,
- this.onDragMove_.bind(this));
- this.container_.addEventListener(TouchHandler.EventType.DRAG_END,
- this.onDragEnd_.bind(this));
-
- this.touchHandler_.enable(/* opt_capture */ false);
+ // available. Ideally we would support touch events whenever they
+ // are fired, but for now restrict this extra code to when we know
+ // we want to support touch input.
+ if (cr.isTouchOptimized) {
+ var TouchHandler = cr.ui.TouchHandler;
+ this.container_.addEventListener(TouchHandler.EventType.TOUCH_START,
+ this.onTouchStart_.bind(this));
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_START,
+ this.onDragStart_.bind(this));
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_MOVE,
+ this.onDragMove_.bind(this));
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_END,
+ this.onDragEnd_.bind(this));
+
+ this.touchHandler_.enable(/* opt_capture */ false);
+ }
},
/**
« no previous file with comments | « chrome/browser/resources/ntp4/tools/externs.js ('k') | chrome/browser/resources/shared/js/cr/ui/touch_handler.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698