diff options
author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 21:44:42 +0000 |
---|---|---|
committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-30 21:44:42 +0000 |
commit | 9d5ae76fed0c746fbc1d8424d0fb99c79a07205c (patch) | |
tree | 792aa42a20793c8d9458d9b790a830c08b1203d1 /chrome/browser/resources | |
parent | 433819da3ead5c8ef282c3068c61c8ecfc2e31c7 (diff) | |
download | chromium_src-9d5ae76fed0c746fbc1d8424d0fb99c79a07205c.zip chromium_src-9d5ae76fed0c746fbc1d8424d0fb99c79a07205c.tar.gz chromium_src-9d5ae76fed0c746fbc1d8424d0fb99c79a07205c.tar.bz2 |
NTP: Add work around for recent changes to HTML5 DnD behavior.
BUG=33657
TEST=Drag and drop thumbnails on the NTP to reorder them.
Review URL: http://codereview.chromium.org/558055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37647 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r-- | chrome/browser/resources/new_new_tab.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/resources/new_new_tab.js b/chrome/browser/resources/new_new_tab.js index 7bdb9ef..cac3e70 100644 --- a/chrome/browser/resources/new_new_tab.js +++ b/chrome/browser/resources/new_new_tab.js @@ -64,6 +64,8 @@ function bind(fn, selfObj, var_args) { } } +const IS_MAC = /$Mac/.test(navigator.platform); + var loading = true; var mostVisitedData = []; var gotMostVisited = false; @@ -1067,9 +1069,8 @@ $('most-visited').addEventListener('click', function(e) { // Allow blacklisting most visited site using the keyboard. $('most-visited').addEventListener('keydown', function(e) { - var isMac = /$Mac/.test(navigator.platform); - if (!isMac && e.keyCode == 46 || // Del - isMac && e.metaKey && e.keyCode == 8) { // Cmd + Backspace + if (!IS_MAC && e.keyCode == 46 || // Del + IS_MAC && e.metaKey && e.keyCode == 8) { // Cmd + Backspace mostVisited.blacklist(e.target); } }); @@ -1335,6 +1336,12 @@ document.addEventListener('mouseover', function(e) { // DnD var dnd = { + /** + * Windows and Linux only support copy drag and drop. + * @see http://crbug.com/14654/ + * @type {string} + */ + DND_EFFECT: IS_MAC ? 'move' : 'copy', currentOverItem_: null, get currentOverItem() { return this.currentOverItem_; @@ -1390,6 +1397,7 @@ var dnd = { this.dragItem = thumbnail; addClass(this.dragItem, 'dragging'); this.dragItem.style.zIndex = 2; + e.dataTransfer.effectAllowed = this.DND_EFFECT; } }, @@ -1404,6 +1412,7 @@ var dnd = { this.currentOverItem = item; if (this.canDropOnElement(item)) { e.preventDefault(); + e.dataTransfer.dropEffect = this.DND_EFFECT; } }, |