diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 21:01:58 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 21:01:58 +0000 |
| commit | aba6dc84f7d7d6f646a4eaaef959df5c60fd0f12 (patch) | |
| tree | 01cfe67125ba6cf2987c5d960ccde61e2d417d0f | |
| parent | b666f9b08a6f9732ee68c059037a41283196e130 (diff) | |
| download | chromium_src-aba6dc84f7d7d6f646a4eaaef959df5c60fd0f12.zip chromium_src-aba6dc84f7d7d6f646a4eaaef959df5c60fd0f12.tar.gz chromium_src-aba6dc84f7d7d6f646a4eaaef959df5c60fd0f12.tar.bz2 | |
[WebUI] Use contains instead of indexOf on event.dataTransfer.types
R=rbyers@chromium.org,mmenke@chromium.org
BUG=115433,115276
TEST=Drag and drop from outside sources works on NTP and file drag and drop to load logs works on net-internals.
Review URL: http://codereview.chromium.org/9453018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123326 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/net_internals/import_view.js | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/ntp4/apps_page.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/resources/net_internals/import_view.js b/chrome/browser/resources/net_internals/import_view.js index 5720c3a..49bb67fd 100644 --- a/chrome/browser/resources/net_internals/import_view.js +++ b/chrome/browser/resources/net_internals/import_view.js @@ -91,7 +91,7 @@ var ImportView = (function() { * security reasons, which is why we allow the |files| array to be empty. */ onDrag: function(event) { - return event.dataTransfer.types.indexOf('Files') == -1 || + return !event.dataTransfer.types.contains('Files') || event.dataTransfer.files.length > 1; }, @@ -100,7 +100,7 @@ var ImportView = (function() { * file, tries to load it as a log file. */ onDrop: function(event) { - if (event.dataTransfer.types.indexOf('Files') == -1 || + if (!event.dataTransfer.types.contains('Files') || event.dataTransfer.files.length != 1) { return; } diff --git a/chrome/browser/resources/ntp4/apps_page.js b/chrome/browser/resources/ntp4/apps_page.js index 3c5ba1a..16dcfcb 100644 --- a/chrome/browser/resources/ntp4/apps_page.js +++ b/chrome/browser/resources/ntp4/apps_page.js @@ -791,7 +791,7 @@ cr.define('ntp4', function() { /** @inheritDoc */ shouldAcceptDrag: function(e) { return !!ntp4.getCurrentlyDraggingTile() || - (e.dataTransfer && e.dataTransfer.types.indexOf('url') != -1); + (e.dataTransfer && e.dataTransfer.types.contains('text/uri-list')); }, /** @inheritDoc */ |