summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 16:06:18 +0000
committerserya@google.com <serya@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-17 16:06:18 +0000
commitbcf6762fcdcf843dcc0d400a6bda517a8ff1e466 (patch)
treee917b8b37ffd47f5553aec31f92bd5792a5cc3f3
parent17aee81747056b08197e205a39f92facee3a61b0 (diff)
downloadchromium_src-bcf6762fcdcf843dcc0d400a6bda517a8ff1e466.zip
chromium_src-bcf6762fcdcf843dcc0d400a6bda517a8ff1e466.tar.gz
chromium_src-bcf6762fcdcf843dcc0d400a6bda517a8ff1e466.tar.bz2
Prevent dragging in open/save dialogs.
Files in open and save dialogs are draggable (with no effect). Fixing it. BUG=None TEST=Manual test. Review URL: https://chromiumcodereview.appspot.com/10108017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132585 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/css/file_manager.css5
-rw-r--r--chrome/browser/resources/file_manager/js/file_transfer_controller.js1
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index 924c848..6f58b3a 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -702,11 +702,6 @@ input.rename {
width: 114px;
}
-.thumbnail-grid li,
-.detail-table list li {
- -webkit-user-drag: element;
-}
-
/* The cr.ui.Table representing the detailed file list. */
.detail-table {
border: 0;
diff --git a/chrome/browser/resources/file_manager/js/file_transfer_controller.js b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
index dc07b1b..e812199 100644
--- a/chrome/browser/resources/file_manager/js/file_transfer_controller.js
+++ b/chrome/browser/resources/file_manager/js/file_transfer_controller.js
@@ -39,6 +39,7 @@ FileTransferController.prototype = {
* @param {cr.ui.List} list Items in the list will be draggable.
*/
attachDragSource: function(list) {
+ list.style.webkitUserDrag = 'element';
list.addEventListener('dragstart', this.onDragStart_.bind(this, list));
list.addEventListener('dragend', this.onDragEnd_.bind(this, list));
list.addEventListener('drag', this.onDrag_.bind(this, list));