Index: ui/file_manager/file_manager/foreground/js/file_transfer_controller.js |
diff --git a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js |
index ce3df963b45b79bc2ddbc238b7c52bf976a8d6f1..f37baeb0b4df75bc5558593ed75754975b141a2e 100644 |
--- a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js |
+++ b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js |
@@ -193,7 +193,7 @@ FileTransferController.prototype = { |
dataTransfer.effectAllowed = effectAllowed; |
dataTransfer.setData('fs/effectallowed', effectAllowed); |
dataTransfer.setData('fs/missingFileContents', |
- !this.isAllSelectedFilesAvailable_()); |
+ (!this.isAllSelectedFilesAvailable_()).toString()); |
for (var i = 0; i < this.selectedFileObjects_.length; i++) { |
dataTransfer.items.add(this.selectedFileObjects_[i]); |
@@ -398,7 +398,7 @@ FileTransferController.prototype = { |
dialogResult, |
function() { |
// TODO(hirono): Check chrome.runtime.lastError here. |
- fulfill(); |
+ fulfill(null); |
}); |
}).then(requestDriveShare.bind(null, index + 1)); |
}; |
@@ -449,7 +449,7 @@ FileTransferController.prototype = { |
var imagePromise = metadataPromise.then(function(metadata) { |
return new Promise(function(fulfill, reject) { |
var loader = new ThumbnailLoader( |
- entry, ThumbnailLoader.LoaderType.Image, metadata); |
+ entry, ThumbnailLoader.LoaderType.IMAGE, metadata); |
loader.loadDetachedImage(function(result) { |
if (result) |
fulfill(loader.getImage()); |
@@ -557,8 +557,8 @@ FileTransferController.prototype = { |
} |
var dt = event.dataTransfer; |
- var canCopy = this.canCopyOrDrag_(dt); |
- var canCut = this.canCutOrDrag_(dt); |
+ var canCopy = this.canCopyOrDrag_(); |
+ var canCut = this.canCutOrDrag_(); |
if (canCopy || canCut) { |
if (canCopy && canCut) { |
this.cutOrCopy_(dt, 'all'); |