Fix minor WebUI dialog issues, mostly with bookmark management

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

 // Copyright (c) 2011 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.
 
 const BookmarkList = bmm.BookmarkList;
 const BookmarkTree = bmm.BookmarkTree;
 const ListItem = cr.ui.ListItem;
 const TreeItem = cr.ui.TreeItem;
 const LinkKind = cr.LinkKind;
 const Command = cr.ui.Command;
@@ skipping 112 matching lines @@
  */
 function addOneShotEventListener(node, name, handler) {
   var f = function(e) {
     handler(e);
     node.removeEventListener(name, f);
   };
   node.addEventListener(name, f);
 }
 
 /**
+ * Update the locaiton hash to reflect the current state of the application.

[flackr, 2011/10/24 19:16:01]

s/Update/Updates (as per style guide statement that function comments are
descriptive rather than imperative)
s/locaiton/location

[Rick Byers, 2011/10/24 20:02:42]

Done, thanks for the style pointer!
Done

+ */
+function updateHash() {
+  window.location.hash = tree.selectedItem.bookmarkId;
+}
+
+/**
  * Navigates to a bookmark ID.
  * @param {string} id The ID to navigate to.
  * @param {boolean=} opt_updateHashNow Whether to immediately update the
  *     location.hash. If false then it is updated in a timeout.
  */
 function navigateTo(id, opt_updateHashNow) {
-  console.info('navigateTo', 'from', window.location.hash, 'to', id);
+  // console.info('navigateTo', 'from', window.location.hash, 'to', id);
   // Update the location hash using a timer to prevent reentrancy. This is how
   // often we add history entries and the time here is a bit arbitrary but was
   // picked as the smallest time a human perceives as instant.
 
-  function f() {
-    window.location.hash = tree.selectedItem.bookmarkId;
-  }
-
   clearTimeout(navigateTo.timer_);
   if (opt_updateHashNow)
-    f();
+    updateHash();
   else
-    navigateTo.timer_ = setTimeout(f, 250);
+    navigateTo.timer_ = setTimeout(updateHash, 250);
 
   updateParentId(id);
 }
 
 /**
  * Updates the parent ID of the bookmark list and selects the correct tree item.
  * @param {string} id The id.
  */
 function updateParentId(id) {
   list.parentId = id;
   if (id in bmm.treeLookup)
     tree.selectedItem = bmm.treeLookup[id];
 }
 
 // Process the location hash. This is called onhashchange and when the page is
 // first loaded.
 function processHash() {
   var id = window.location.hash.slice(1);
   if (!id) {
     // If we do not have a hash select first item in the tree.
     id = tree.items[0].bookmarkId;
   }
 
   var valid = false;
-  if (/^[ae]=/.test(id)) {
-    var command = id[0];
+  if (/^e=/.test(id)) {
     id = id.slice(2);
-    if (command == 'e') {
-      // If hash contains e= edit the item specified.
-      chrome.bookmarks.get(id, function(bookmarkNodes) {
-        // Verify the node to edit is a valid node.
-        if (!bookmarkNodes || bookmarkNodes.length != 1)
-          return;
-        var bookmarkNode = bookmarkNodes[0];
-        // After the list reloads edit the desired bookmark.
-        var editBookmark = function(e) {
-          var index = list.dataModel.findIndexById(bookmarkNode.id);
-          if (index != -1) {
-            var sm = list.selectionModel;
-            sm.anchorIndex = sm.leadIndex = sm.selectedIndex = index;
-            scrollIntoViewAndMakeEditable(index);
-          }
+
+    // If hash contains e= edit the item specified.
+    chrome.bookmarks.get(id, function(bookmarkNodes) {
+      // Verify the node to edit is a valid node.
+      if (!bookmarkNodes || bookmarkNodes.length != 1)
+        return;
+      var bookmarkNode = bookmarkNodes[0];
+
+      // After the list reloads edit the desired bookmark.
+      var editBookmark = function(e) {
+        var index = list.dataModel.findIndexById(bookmarkNode.id);
+        if (index != -1) {
+          var sm = list.selectionModel;
+          sm.anchorIndex = sm.leadIndex = sm.selectedIndex = index;
+          scrollIntoViewAndMakeEditable(index);
         }
+      };
 
-        if (list.parentId == bookmarkNode.parentId)
-          editBookmark();
-        else {
-          // Navigate to the parent folder, once it's loaded edit the bookmark.
-          addOneShotEventListener(list, 'load', editBookmark);
-          updateParentId(bookmarkNode.parentId);
-        }
-      });
-      // We handle the two cases of navigating to the bookmark to be edited
-      // above, don't run the standard navigation code below.
-      return;
-    } else if (command == 'a') {
-      // Once the parent folder is loaded add a page bookmark.
-      addOneShotEventListener(list, 'load', addPage);
-    }
+      if (list.parentId == bookmarkNode.parentId) {
+        // Clear the e= from the hash so that future attemps to edit the same
+        // entry will show up as a hash change.
+        updateHash();
+        editBookmark();
+      } else {
+        // Navigate to the parent folder (which will update the hash), once
+        // it's loaded edit the bookmark.
+        addOneShotEventListener(list, 'load', editBookmark);
+        updateParentId(bookmarkNode.parentId);
+      }
+    });
+
+    // We handle the two cases of navigating to the bookmark to be edited
+    // above, don't run the standard navigation code below.
+    return;
   } else if (/^q=/.test(id)) {
     // In case we got a search hash update the text input and the
     // bmm.treeLookup to use the new id.
     setSearch(id.slice(2));
     valid = true;
   } else if (id == 'recent') {
     valid = true;
   }
 
   // Navigate to bookmark 'id' (which may be a query of the form q=query).
   if (valid) {
     updateParentId(id);
   } else {
     // We need to verify that this is a correct ID.
     chrome.bookmarks.get(id, function(items) {
       if (items && items.length == 1)
         updateParentId(id);
     });
   }
 };
 
 // We listen to hashchange so that we can update the currently shown folder when
 // the user goes back and forward in the history.
 window.onhashchange = function(e) {
+  // console.info('onhashchange', e.oldURL, e.newURL);
   processHash();
 };
 
 // Activate is handled by the open-in-same-window-command.
 list.addEventListener('dblclick', function(e) {
   if (e.button == 0)
     $('open-in-same-window-command').execute();
 });
 
 // The list dispatches an event when the user clicks on the URL or the Show in
@@ skipping 1414 matching lines @@
   document.addEventListener('copy', handle('copy-command'));
   document.addEventListener('cut', handle('cut-command'));
 
   var pasteHandler = handle('paste-command');
   document.addEventListener('paste', function(e) {
     // Paste is a bit special since we need to do an async call to see if we can
     // paste because the paste command might not be up to date.
     updatePasteCommand(pasteHandler);
   });
 })();