Revert "BMM: Split initialization into two phases"

chrome/browser/resources/bookmark_manager/js/main.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function() {
 /** @const */ var BookmarkList = bmm.BookmarkList;
 /** @const */ var BookmarkTree = bmm.BookmarkTree;
 /** @const */ var Command = cr.ui.Command;
 /** @const */ var CommandBinding = cr.ui.CommandBinding;
 /** @const */ var LinkKind = cr.LinkKind;
@@ skipping 126 matching lines @@
   searchTreeItem.label = loadTimeData.getString('search');
   searchTreeItem.icon = isRTL() ? 'images/bookmark_manager_search_rtl.png' :
                                   'images/bookmark_manager_search.png';
 }
 
 /**
  * Updates the location hash to reflect the current state of the application.
  */
 function updateHash() {
   window.location.hash = tree.selectedItem.bookmarkId;
-  updateAllCommands();
 }
 
 /**
  * Navigates to a bookmark ID.
  * @param {string} id The ID to navigate to.
  * @param {function()} callback Function called when list view loaded or
  *     displayed specified folder.
  */
 function navigateTo(id, callback) {
   updateHash(id);
@@ skipping 195 matching lines @@
   return urlsPromise;
 }
 
 /**
  * Returns the nodes (non recursive) to use for the open commands.
  * @param {HTMLElement} target .
  * @return {Array.<BookmarkTreeNode>} .
  */
 function getNodesForOpen(target) {
   if (target == tree) {
-    if (tree.selectedItem != searchTreeItem)
-      return tree.selectedFolders;
-    // Fall through to use all nodes in the list.
-  } else {
-    var items = list.selectedItems;
-    if (items.length)
-      return items;
+    var folderItem = tree.selectedItem;
+    return folderItem == searchTreeItem ?
+        list.dataModel.slice() : tree.selectedFolders;
   }
-
-  // The list starts off with a null dataModel. We can get here during startup.
-  if (!list.dataModel)
-    return [];
-
-  // Return an array based on the dataModel.
-  return list.dataModel.slice();
+  var items = list.selectedItems;
+  return items.length ? items : list.dataModel.slice();
 }
 
 /**
  * Returns a promise that will contain all URLs of all the selected bookmarks
  * and the nested bookmarks for use with the open commands.
  * @param {HTMLElement} target The target list or tree.
  * @return {Promise} .
  */
 function getUrlsForOpenCommands(target) {
   return getAllUrls(getNodesForOpen(target));
@@ skipping 62 matching lines @@
   var command = e.command;
   switch (command.id) {
     case 'import-menu-command':
       e.canExecute = canEdit;
       break;
     case 'export-menu-command':
       // We can always execute the export-menu command.
       e.canExecute = true;
       break;
     case 'sort-command':
-      e.canExecute = !list.isSearch() &&
-          list.dataModel && list.dataModel.length > 1;
+      e.canExecute = !list.isSearch() && list.dataModel.length > 1;
       break;
     case 'undo-command':
       // The global undo command has no visible UI, so always enable it, and
       // just make it a no-op if undo is not possible.
       e.canExecute = true;
       break;
     default:
       canExecuteForList(e);
       break;
   }
@@ skipping 167 matching lines @@
     case 'copy-command':
       e.canExecute = hasSelected() && !isTopLevelItem();
       break;
 
     default:
       canExecuteShared(e, isSearch());
   }
 }
 
 /**
- * Update the canExecute state of all the commands.
+ * Update the canExecute state of the commands when the selection changes.
+ * @param {Event} e The change event object.
  */
-function updateAllCommands() {
-  var commands = document.querySelectorAll('command');
-  for (var i = 0; i < commands.length; i++) {
-    commands[i].canExecuteChange();
+function updateCommandsBasedOnSelection(e) {
+  if (e.target == document.activeElement) {
+    // Paste only needs to be updated when the tree selection changes.
+    var commandNames = ['copy', 'cut', 'delete', 'rename-folder', 'edit',
+      'add-new-bookmark', 'new-folder', 'open-in-new-tab',
+      'open-in-background-tab', 'open-in-new-window', 'open-incognito-window',
+      'open-in-same-window', 'show-in-folder'];
+
+    if (e.target == tree) {
+      commandNames.push('paste-from-context-menu', 'paste-from-organize-menu',
+                        'sort');
+    }
+
+    commandNames.forEach(function(baseId) {
+      $(baseId + '-command').canExecuteChange();
+    });
   }
 }
 
 function updateEditingCommands() {
   var editingCommands = ['cut', 'delete', 'rename-folder', 'edit',
       'add-new-bookmark', 'new-folder', 'sort',
       'paste-from-context-menu', 'paste-from-organize-menu'];
 
   chrome.bookmarkManagerPrivate.canEdit(function(result) {
     if (result != canEdit) {
       canEdit = result;
       editingCommands.forEach(function(baseId) {
         $(baseId + '-command').canExecuteChange();
       });
     }
   });
 }
 
 function handleChangeForTree(e) {
-  updateAllCommands();
+  updateCommandsBasedOnSelection(e);
   navigateTo(tree.selectedItem.bookmarkId, updateHash);
 }
 
 function handleOrganizeButtonClick(e) {
   updateEditingCommands();
   $('add-new-bookmark-command').canExecuteChange();
   $('new-folder-command').canExecuteChange();
   $('sort-command').canExecuteChange();
 }
 
@@ skipping 523 matching lines @@
   splitter.addEventListener('resize', function(e) {
     localStorage['treeWidth'] = splitter.previousElementSibling.style.width;
   });
 }
 
 function initializeBookmarkManager() {
   // Sometimes the extension API is not initialized.
   if (!chrome.bookmarks)
     console.error('Bookmarks extension API is not available');
 
-  chrome.bookmarkManagerPrivate.getStrings(continueInitializeBookmarkManager);
-}
-
-function continueInitializeBookmarkManager(localizedStrings) {
-  loadLocalizedStrings(localizedStrings);
+  chrome.bookmarkManagerPrivate.getStrings(loadLocalizedStrings);
 
   bmm.treeLookup[searchTreeItem.bookmarkId] = searchTreeItem;
 
   cr.ui.decorate('menu', Menu);
   cr.ui.decorate('button[menu]', MenuButton);
   cr.ui.decorate('command', Command);
   BookmarkList.decorate(list);
   BookmarkTree.decorate(tree);
 
   list.addEventListener('canceledit', handleCancelEdit);
   list.addEventListener('canExecute', handleCanExecuteForList);
-  list.addEventListener('change', updateAllCommands);
+  list.addEventListener('change', updateCommandsBasedOnSelection);
   list.addEventListener('contextmenu', updateEditingCommands);
   list.addEventListener('dblclick', handleDoubleClickForList);
   list.addEventListener('edit', handleEdit);
   list.addEventListener('rename', handleRename);
   list.addEventListener('urlClicked', handleUrlClickedForList);
 
   tree.addEventListener('canExecute', handleCanExecuteForTree);
   tree.addEventListener('change', handleChangeForTree);
   tree.addEventListener('contextmenu', updateEditingCommands);
   tree.addEventListener('rename', handleRename);
@@ skipping 58 matching lines @@
 
   cr.ui.FocusOutlineManager.forDocument(document);
   initializeSplitter();
   bmm.addBookmarkModelListeners();
   dnd.init(selectItemsAfterUserAction);
   tree.reload();
 }
 
 initializeBookmarkManager();
 })();