diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 23:30:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 23:30:14 +0000 |
| commit | 4d62faee9d0af7dc217954c57d57c62b3f819b9f (patch) | |
| tree | 5b38528ac3b8535f64123e9a3c0dcb071099f250 | |
| parent | ffe13e5d1339ece50ed25a81bb433d8fb4153b31 (diff) | |
| download | chromium_src-4d62faee9d0af7dc217954c57d57c62b3f819b9f.zip chromium_src-4d62faee9d0af7dc217954c57d57c62b3f819b9f.tar.gz chromium_src-4d62faee9d0af7dc217954c57d57c62b3f819b9f.tar.bz2 | |
ntp4: fix assert
if you drag an app onto the page switchers and wait until it goes to the most visited page, it will start spamming asserts because MostVisited does not implement setDropEffect. I don't think anything harmful happens without this patch, but the assert is log spam.
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/8013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102614 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/ntp4/page_switcher.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/resources/ntp4/page_switcher.js b/chrome/browser/resources/ntp4/page_switcher.js index e52777d..081df84 100644 --- a/chrome/browser/resources/ntp4/page_switcher.js +++ b/chrome/browser/resources/ntp4/page_switcher.js @@ -48,6 +48,7 @@ cr.define('ntp4', function() { }, shouldAcceptDrag: function(e) { + // We allow all drags to trigger the page switching effect. return true; }, @@ -63,7 +64,8 @@ cr.define('ntp4', function() { doDragOver: function(e) { e.preventDefault(); var targetPage = ntp4.getCardSlider().currentCardValue; - targetPage.setDropEffect(e.dataTransfer); + if (targetPage.shouldAcceptDrag(e)) + targetPage.setDropEffect(e.dataTransfer); }, doDrop: function(e) { @@ -76,7 +78,7 @@ cr.define('ntp4', function() { var sourcePage = tile.tilePage; var targetPage = ntp4.getCardSlider().currentCardValue; - if (targetPage == sourcePage) + if (targetPage == sourcePage || !targetPage.shouldAcceptDrag(e)) return; targetPage.appendDraggingTile(); |