summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authoryawano <yawano@chromium.org>2014-11-12 21:33:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-13 05:34:46 +0000
commit5665540411410a97c3e9f4e18f7ece0b16f699ca (patch)
treec626a267fb332cff8a6d9a2fa7c99e4dc9be5ee4 /ui
parenta46c4ce237909817da1a768b84b6b3f4d3a52247 (diff)
downloadchromium_src-5665540411410a97c3e9f4e18f7ece0b16f699ca.zip
chromium_src-5665540411410a97c3e9f4e18f7ece0b16f699ca.tar.gz
chromium_src-5665540411410a97c3e9f4e18f7ece0b16f699ca.tar.bz2
Fixed incorrect call of updateContextMenuActionItems.
BUG=432439 TEST=Manually tested. Review URL: https://codereview.chromium.org/722003002 Cr-Commit-Position: refs/heads/master@{#303990}
Diffstat (limited to 'ui')
-rw-r--r--ui/file_manager/file_manager/foreground/js/file_selection.js26
1 files changed, 14 insertions, 12 deletions
diff --git a/ui/file_manager/file_manager/foreground/js/file_selection.js b/ui/file_manager/file_manager/foreground/js/file_selection.js
index 745569c..f1655ef 100644
--- a/ui/file_manager/file_manager/foreground/js/file_selection.js
+++ b/ui/file_manager/file_manager/foreground/js/file_selection.js
@@ -179,27 +179,29 @@ function FileSelectionHandler(fileManager) {
}
/**
- * Create the temporary disabled action menu item.
+ * Create the temporary disabled action item.
* @return {Object} Created disabled item.
* @private
*/
-FileSelectionHandler.createTemporaryDisabledActionMenuItem_ = function() {
- if (!FileSelectionHandler.cachedDisabledActionMenuItem_) {
- FileSelectionHandler.cachedDisabledActionMenuItem_ = {
- label: str('ACTION_OPEN'),
- disabled: true
+FileSelectionHandler.createTemporaryDisabledActionItem_ = function() {
+ if (!FileSelectionHandler.cachedDisabledActionItem_) {
+ FileSelectionHandler.cachedDisabledActionItem_ = {
+ title: str('ACTION_OPEN'),
+ disabled: true,
+ taskId: null
};
}
- return FileSelectionHandler.cachedDisabledActionMenuItem_;
+ return FileSelectionHandler.cachedDisabledActionItem_;
};
/**
- * Cached the temporary disabled action menu item. Used inside
- * FileSelectionHandler.createTemporaryDisabledActionMenuItem_().
+ * Cached the temporary disabled action item. Used inside
+ * FileSelectionHandler.createTemporaryDisabledActionItem_().
+ * @type {Object}
* @private
*/
-FileSelectionHandler.cachedDisabledActionMenuItem_ = null;
+FileSelectionHandler.cachedDisabledActionItem_ = null;
/**
* FileSelectionHandler extends cr.EventTarget.
@@ -256,10 +258,10 @@ FileSelectionHandler.prototype.onFileSelectionChanged = function() {
// Show disabled items for position calculation of the menu. They will be
// overridden in this.updateFileSelectionAsync().
this.fileManager_.updateContextMenuActionItems(
- FileSelectionHandler.createTemporaryDisabledActionMenuItem_());
+ [FileSelectionHandler.createTemporaryDisabledActionItem_()]);
} else {
// Update context menu.
- this.fileManager_.updateContextMenuActionItems(null);
+ this.fileManager_.updateContextMenuActionItems();
}
this.selectionUpdateTimer_ = setTimeout(function() {