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

Side by Side Diff: chrome/browser/resources/ntp4/tile_page.js

Issue 10092017: Mac: Prevent NTP mousewheel events from being suppressed on Lion. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 cr.define('ntp', function() { 5 cr.define('ntp', function() {
6 'use strict'; 6 'use strict';
7 7
8 // We can't pass the currently dragging tile via dataTransfer because of 8 // We can't pass the currently dragging tile via dataTransfer because of
9 // http://crbug.com/31037 9 // http://crbug.com/31037
10 var currentlyDraggingTile = null; 10 var currentlyDraggingTile = null;
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // These are properties used in updateTopMargin. 441 // These are properties used in updateTopMargin.
442 this.animatedTopMarginPx_ = 0; 442 this.animatedTopMarginPx_ = 0;
443 this.topMarginPx_ = 0; 443 this.topMarginPx_ = 0;
444 444
445 this.eventTracker = new EventTracker(); 445 this.eventTracker = new EventTracker();
446 this.eventTracker.add(window, 'resize', this.onResize_.bind(this)); 446 this.eventTracker.add(window, 'resize', this.onResize_.bind(this));
447 447
448 this.addEventListener('DOMNodeInsertedIntoDocument', 448 this.addEventListener('DOMNodeInsertedIntoDocument',
449 this.onNodeInsertedIntoDocument_); 449 this.onNodeInsertedIntoDocument_);
450 450
451 this.addEventListener('mousewheel', this.onMouseWheel_); 451 // this.addEventListener('mousewheel', this.onMouseWheel_);
Patrick Dubroy 2012/04/16 21:27:59 This should have a bool value passed in to indicat
452 this.content_.addEventListener('scroll', this.onScroll_.bind(this)); 452 this.content_.addEventListener('scroll', this.onScroll_.bind(this));
453 453
454 this.dragWrapper_ = new cr.ui.DragWrapper(this.tileGrid_, this); 454 this.dragWrapper_ = new cr.ui.DragWrapper(this.tileGrid_, this);
455 455
456 this.addEventListener('cardselected', this.handleCardSelection_); 456 this.addEventListener('cardselected', this.handleCardSelection_);
457 this.addEventListener('carddeselected', this.handleCardDeselection_); 457 this.addEventListener('carddeselected', this.handleCardDeselection_);
458 this.addEventListener('focus', this.handleFocus_); 458 this.addEventListener('focus', this.handleFocus_);
459 this.addEventListener('keydown', this.handleKeyDown_); 459 this.addEventListener('keydown', this.handleKeyDown_);
460 this.addEventListener('mousedown', this.handleMouseDown_); 460 this.addEventListener('mousedown', this.handleMouseDown_);
461 461
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 assert(false); 1333 assert(false);
1334 }, 1334 },
1335 }; 1335 };
1336 1336
1337 return { 1337 return {
1338 getCurrentlyDraggingTile: getCurrentlyDraggingTile, 1338 getCurrentlyDraggingTile: getCurrentlyDraggingTile,
1339 setCurrentDropEffect: setCurrentDropEffect, 1339 setCurrentDropEffect: setCurrentDropEffect,
1340 TilePage: TilePage, 1340 TilePage: TilePage,
1341 }; 1341 };
1342 }); 1342 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698