| Index: chrome/browser/resources/bookmark_manager/js/main.js
|
| diff --git a/chrome/browser/resources/bookmark_manager/js/main.js b/chrome/browser/resources/bookmark_manager/js/main.js
|
| index c2689e2185b51cb29827d4384c9b0bb182a97d81..4f9cc390fd096dd3f5296a2e1b03b82d571131a5 100644
|
| --- a/chrome/browser/resources/bookmark_manager/js/main.js
|
| +++ b/chrome/browser/resources/bookmark_manager/js/main.js
|
| @@ -61,9 +61,7 @@ var canEdit = true;
|
| * @type {TreeItem}
|
| * @const
|
| */
|
| -var searchTreeItem = new TreeItem({
|
| - bookmarkId: 'q='
|
| -});
|
| +var searchTreeItem = new TreeItem({bookmarkId: 'q='});
|
|
|
| /**
|
| * @type {boolean}
|
| @@ -74,28 +72,30 @@ var firstLoad = true;
|
| * Command shortcut mapping.
|
| * @const
|
| */
|
| -var commandShortcutMap = cr.isMac ? {
|
| - 'edit': 'Enter',
|
| - // On Mac we also allow Meta+Backspace.
|
| - 'delete': 'Delete Backspace Meta|Backspace',
|
| - 'open-in-background-tab': 'Meta|Enter',
|
| - 'open-in-new-tab': 'Shift|Meta|Enter',
|
| - 'open-in-same-window': 'Meta|Down',
|
| - 'open-in-new-window': 'Shift|Enter',
|
| - 'rename-folder': 'Enter',
|
| - // Global undo is Command-Z. It is not in any menu.
|
| - 'undo': 'Meta|z',
|
| -} : {
|
| - 'edit': 'F2',
|
| - 'delete': 'Delete',
|
| - 'open-in-background-tab': 'Ctrl|Enter',
|
| - 'open-in-new-tab': 'Shift|Ctrl|Enter',
|
| - 'open-in-same-window': 'Enter',
|
| - 'open-in-new-window': 'Shift|Enter',
|
| - 'rename-folder': 'F2',
|
| - // Global undo is Ctrl-Z. It is not in any menu.
|
| - 'undo': 'Ctrl|z',
|
| -};
|
| +var commandShortcutMap = cr.isMac ?
|
| + {
|
| + 'edit': 'Enter',
|
| + // On Mac we also allow Meta+Backspace.
|
| + 'delete': 'Delete Backspace Meta|Backspace',
|
| + 'open-in-background-tab': 'Meta|Enter',
|
| + 'open-in-new-tab': 'Shift|Meta|Enter',
|
| + 'open-in-same-window': 'Meta|Down',
|
| + 'open-in-new-window': 'Shift|Enter',
|
| + 'rename-folder': 'Enter',
|
| + // Global undo is Command-Z. It is not in any menu.
|
| + 'undo': 'Meta|z',
|
| + } :
|
| + {
|
| + 'edit': 'F2',
|
| + 'delete': 'Delete',
|
| + 'open-in-background-tab': 'Ctrl|Enter',
|
| + 'open-in-new-tab': 'Shift|Ctrl|Enter',
|
| + 'open-in-same-window': 'Enter',
|
| + 'open-in-new-window': 'Shift|Enter',
|
| + 'rename-folder': 'F2',
|
| + // Global undo is Ctrl-Z. It is not in any menu.
|
| + 'undo': 'Ctrl|z',
|
| + };
|
|
|
| /**
|
| * Mapping for folder id to suffix of UMA. These names will be appeared
|
| @@ -163,7 +163,7 @@ function navigateTo(id, opt_callback) {
|
| updateAllCommands();
|
|
|
| var metricsId = folderMetricsNameMap[id.replace(/^q=.*/, 'q=')] ||
|
| - folderMetricsNameMap['subfolder'];
|
| + folderMetricsNameMap['subfolder'];
|
| chrome.metricsPrivate.recordUserAction(
|
| 'BookmarkManager_NavigateTo_' + metricsId);
|
|
|
| @@ -429,12 +429,12 @@ function updateOpenCommand(e, command, singularId, pluralId, commandDisabled) {
|
| return;
|
| }
|
|
|
| - getUrlsForOpenCommands(assertInstanceof(e.target, HTMLElement)).then(
|
| - function(urls) {
|
| - var disabled = !urls.length;
|
| - command.disabled = disabled;
|
| - e.canExecute = !disabled;
|
| - });
|
| + getUrlsForOpenCommands(assertInstanceof(e.target, HTMLElement))
|
| + .then(function(urls) {
|
| + var disabled = !urls.length;
|
| + command.disabled = disabled;
|
| + e.canExecute = !disabled;
|
| + });
|
| }
|
|
|
| /**
|
| @@ -488,7 +488,8 @@ function updatePasteCommand(opt_f) {
|
| if (cmd)
|
| update('paste-from-context-menu-command', !$(cmd).disabled);
|
|
|
| - if (opt_f) opt_f();
|
| + if (opt_f)
|
| + opt_f();
|
| });
|
| }
|
|
|
| @@ -517,8 +518,8 @@ function handleCanExecuteForDocument(e) {
|
| break;
|
|
|
| case 'sort-command':
|
| - e.canExecute = !bmm.list.isSearch() &&
|
| - bmm.list.dataModel && bmm.list.dataModel.length > 1 &&
|
| + e.canExecute = !bmm.list.isSearch() && bmm.list.dataModel &&
|
| + bmm.list.dataModel.length > 1 &&
|
| !isUnmodifiable(bmm.tree.getBookmarkNodeById(bmm.list.parentId));
|
| break;
|
|
|
| @@ -555,8 +556,7 @@ function canExecuteShared(e, isSearch) {
|
| case 'new-folder-command':
|
| case 'new-folder-from-folders-menu-command':
|
| var parentId = computeParentFolderForNewItem();
|
| - var unmodifiable = isUnmodifiable(
|
| - bmm.tree.getBookmarkNodeById(parentId));
|
| + var unmodifiable = isUnmodifiable(bmm.tree.getBookmarkNodeById(parentId));
|
| e.canExecute = !isSearch && canEdit && !unmodifiable;
|
| break;
|
|
|
| @@ -569,15 +569,15 @@ function canExecuteShared(e, isSearch) {
|
| break;
|
|
|
| case 'open-in-new-window-command':
|
| - updateOpenCommand(e, command,
|
| - 'open_in_new_window', 'open_all_new_window',
|
| + updateOpenCommand(
|
| + e, command, 'open_in_new_window', 'open_all_new_window',
|
| // Disabled when incognito is forced.
|
| incognitoModeAvailability == 'forced');
|
| break;
|
|
|
| case 'open-incognito-window-command':
|
| - updateOpenCommand(e, command,
|
| - 'open_incognito', 'open_all_incognito',
|
| + updateOpenCommand(
|
| + e, command, 'open_incognito', 'open_all_incognito',
|
| // Not available when incognito is disabled.
|
| incognitoModeAvailability == 'disabled');
|
| break;
|
| @@ -648,8 +648,8 @@ function canExecuteForList(e) {
|
|
|
| case 'delete-command':
|
| case 'cut-command':
|
| - e.canExecute = canCopyItems() && canEdit &&
|
| - !hasUnmodifiable(bmm.list.selectedItems);
|
| + e.canExecute =
|
| + canCopyItems() && canEdit && !hasUnmodifiable(bmm.list.selectedItems);
|
| break;
|
|
|
| case 'copy-command':
|
| @@ -667,13 +667,15 @@ function canExecuteForList(e) {
|
|
|
| // Update canExecute for the commands when the list is the active element.
|
| function handleCanExecuteForList(e) {
|
| - if (e.target != bmm.list) return;
|
| + if (e.target != bmm.list)
|
| + return;
|
| canExecuteForList(e);
|
| }
|
|
|
| // Update canExecute for the commands when the tree is the active element.
|
| function handleCanExecuteForTree(e) {
|
| - if (e.target != bmm.tree) return;
|
| + if (e.target != bmm.tree)
|
| + return;
|
| canExecuteForTree(e);
|
| }
|
|
|
| @@ -688,7 +690,7 @@ function canExecuteForTree(e) {
|
|
|
| function isTopLevelItem() {
|
| return bmm.tree.selectedItem &&
|
| - bmm.tree.selectedItem.parentNode == bmm.tree;
|
| + bmm.tree.selectedItem.parentNode == bmm.tree;
|
| }
|
|
|
| var command = e.command;
|
| @@ -787,14 +789,12 @@ function handleRename(e) {
|
| function handleEdit(e) {
|
| var item = e.target;
|
| var bookmarkNode = item.bookmarkNode;
|
| - var context = {
|
| - title: bookmarkNode.title
|
| - };
|
| + var context = {title: bookmarkNode.title};
|
| if (!bmm.isFolder(bookmarkNode))
|
| context.url = bookmarkNode.url;
|
|
|
| if (bookmarkNode.id == 'new') {
|
| - selectItemsAfterUserAction(/** @type {BookmarkList} */(bmm.list));
|
| + selectItemsAfterUserAction(/** @type {BookmarkList} */ (bmm.list));
|
|
|
| // New page
|
| context.parentId = bookmarkNode.parentId;
|
| @@ -874,7 +874,8 @@ function getLinkController() {
|
| */
|
| function getSelectedBookmarkNodes(opt_target) {
|
| return (opt_target || document.activeElement) == bmm.tree ?
|
| - bmm.tree.selectedFolders : bmm.list.selectedItems;
|
| + bmm.tree.selectedFolders :
|
| + bmm.list.selectedItems;
|
| }
|
|
|
| /**
|
| @@ -883,7 +884,9 @@ function getSelectedBookmarkNodes(opt_target) {
|
| */
|
| function getSelectedBookmarkIds(opt_target) {
|
| var selectedNodes = getSelectedBookmarkNodes(opt_target);
|
| - selectedNodes.sort(function(a, b) { return a.index - b.index; });
|
| + selectedNodes.sort(function(a, b) {
|
| + return a.index - b.index;
|
| + });
|
| return selectedNodes.map(function(node) {
|
| return node.id;
|
| });
|
| @@ -1034,8 +1037,8 @@ function computeParentFolderForNewItem() {
|
| if (document.activeElement == bmm.tree)
|
| return bmm.list.parentId;
|
| var selectedItem = bmm.list.selectedItem;
|
| - return selectedItem && bmm.isFolder(selectedItem) ?
|
| - selectedItem.id : bmm.list.parentId;
|
| + return selectedItem && bmm.isFolder(selectedItem) ? selectedItem.id :
|
| + bmm.list.parentId;
|
| }
|
|
|
| /**
|
| @@ -1071,11 +1074,13 @@ function newFolder(opt_target) {
|
| !bmm.isFolder(selectedItems[0]) && selectedItems[0].id != 'new') {
|
| newIndex = bmm.list.dataModel.indexOf(selectedItems[0]) + 1;
|
| }
|
| - chrome.bookmarks.create({
|
| - title: loadTimeData.getString('new_folder_name'),
|
| - parentId: parentId,
|
| - index: newIndex
|
| - }, callback);
|
| + chrome.bookmarks.create(
|
| + {
|
| + title: loadTimeData.getString('new_folder_name'),
|
| + parentId: parentId,
|
| + index: newIndex
|
| + },
|
| + callback);
|
| }
|
|
|
| if ((opt_target || document.activeElement) == bmm.tree) {
|
| @@ -1128,13 +1133,8 @@ function addPage() {
|
| newIndex = bmm.list.dataModel.indexOf(selectedItems[0]) + 1;
|
| }
|
|
|
| - var fakeNode = {
|
| - title: '',
|
| - url: '',
|
| - parentId: parentId,
|
| - index: newIndex,
|
| - id: 'new'
|
| - };
|
| + var fakeNode =
|
| + {title: '', url: '', parentId: parentId, index: newIndex, id: 'new'};
|
| var dataModel = bmm.list.dataModel;
|
| var index = dataModel.length;
|
| if (newIndex != undefined)
|
| @@ -1218,7 +1218,8 @@ function getSelectedId() {
|
| return bmm.tree.selectedItem.bookmarkId;
|
| var selectedItem = bmm.list.selectedItem;
|
| return selectedItem && bmm.isFolder(selectedItem) ?
|
| - selectedItem.id : bmm.tree.selectedItem.bookmarkId;
|
| + selectedItem.id :
|
| + bmm.tree.selectedItem.bookmarkId;
|
| }
|
|
|
| /**
|
| @@ -1228,7 +1229,7 @@ function getSelectedId() {
|
| */
|
| function pasteBookmark(id) {
|
| recordUserAction('Paste');
|
| - selectItemsAfterUserAction(/** @type {BookmarkList} */(bmm.list));
|
| + selectItemsAfterUserAction(/** @type {BookmarkList} */ (bmm.list));
|
| chrome.bookmarkManagerPrivate.paste(id, getSelectedBookmarkIds());
|
| }
|
|
|
| @@ -1239,8 +1240,8 @@ function pasteBookmark(id) {
|
| function hasSelectedAncestor(parentNode) {
|
| function contains(arr, item) {
|
| for (var i = 0; i < arr.length; i++)
|
| - if (arr[i] === item)
|
| - return true;
|
| + if (arr[i] === item)
|
| + return true;
|
| return false;
|
| }
|
|
|
| @@ -1253,8 +1254,7 @@ function hasSelectedAncestor(parentNode) {
|
| return true;
|
|
|
| // Keep digging.
|
| - return hasSelectedAncestor(
|
| - bmm.tree.getBookmarkNodeById(parentNode.parentId));
|
| + return hasSelectedAncestor(bmm.tree.getBookmarkNodeById(parentNode.parentId));
|
| }
|
|
|
| /**
|
| @@ -1334,19 +1334,19 @@ function handleCommand(e) {
|
| target = bmm.tree;
|
| case 'copy-command':
|
| recordUserAction('Copy');
|
| - chrome.bookmarkManagerPrivate.copy(getSelectedBookmarkIds(target),
|
| - updatePasteCommand);
|
| + chrome.bookmarkManagerPrivate.copy(
|
| + getSelectedBookmarkIds(target), updatePasteCommand);
|
| break;
|
|
|
| case 'cut-from-folders-menu-command':
|
| target = bmm.tree;
|
| case 'cut-command':
|
| recordUserAction('Cut');
|
| - chrome.bookmarkManagerPrivate.cut(getSelectedBookmarkIds(target),
|
| - function() {
|
| - updatePasteCommand();
|
| - updateSearchResults();
|
| - });
|
| + chrome.bookmarkManagerPrivate.cut(
|
| + getSelectedBookmarkIds(target), function() {
|
| + updatePasteCommand();
|
| + updateSearchResults();
|
| + });
|
| break;
|
|
|
| case 'paste-from-organize-menu-command':
|
| @@ -1479,7 +1479,7 @@ function continueInitializeBookmarkManager(localizedStrings) {
|
| bmm.tree.addEventListener('load', handleLoadForTree);
|
|
|
| cr.ui.contextMenuHandler.addContextMenuProperty(
|
| - /** @type {!Element} */(bmm.tree));
|
| + /** @type {!Element} */ (bmm.tree));
|
| bmm.list.contextMenu = $('context-menu');
|
| bmm.tree.contextMenu = $('context-menu');
|
|
|
| @@ -1488,10 +1488,10 @@ function continueInitializeBookmarkManager(localizedStrings) {
|
| window.addEventListener('hashchange', processHash);
|
|
|
| document.querySelector('header form').onsubmit =
|
| - /** @type {function(Event=)} */(function(e) {
|
| - setSearch($('term').value);
|
| - e.preventDefault();
|
| - });
|
| + /** @type {function(Event=)} */ (function(e) {
|
| + setSearch($('term').value);
|
| + e.preventDefault();
|
| + });
|
|
|
| $('term').addEventListener('search', handleSearch);
|
| $('term').addEventListener('canExecute', handleCanExecuteForSearchBox);
|
|
|