Merge 22704 - NNTP: Add a menu item that allows the user to restore all black...

chrome/browser/resources/new_new_tab.js

 
 // Helpers
 
 function $(id) {
   return document.getElementById(id);
 }
 
 // TODO(arv): Remove these when classList is available in HTML5.
 // https://bugs.webkit.org/show_bug.cgi?id=20709
 function hasClass(el, name) {
@@ skipping 730 matching lines @@
   }
 
   console.log(lines.join('\n'));
 }
 
 // Updates the visibility of the menu items.
 function updateOptionMenu() {
   var menuItems = $('option-menu').children;
   for (var i = 0; i < menuItems.length; i++) {
     var item = menuItems[i];
-    var section = Section[item.getAttribute('section')];
-    var show = item.getAttribute('show') == 'true';
-    // Hide show items if already shown. Hide hide items if already hidden.
-    var hideMenuItem = show == !!(shownSections & section);
-    item.style.display = hideMenuItem ? 'none' : '';
+    var command = item.getAttribute('command');
+    if (command == 'show' || command == 'hide') {
+      var show = command == 'show';
+      var section = Section[item.getAttribute('section')];
+      // Hide show items if already shown. Hide hide items if already hidden.
+      var hideMenuItem = show == !!(shownSections & section);
+      item.style.display = hideMenuItem ? 'none' : '';
+    }
   }
 }
 
 // We apply the size class here so that we don't trigger layout animations
 // onload.
 
 handleWindowResize();
 
 var localStrings = new LocalStrings();
 
@@ skipping 122 matching lines @@
   handleMouseDown: function(e) {
     if (this.isShown()) {
       this.hide();
     } else {
       this.show();
     }
   },
 
   handleMouseOver: function(e) {
     var el = e.target;
-    var index = Array.prototype.indexOf.call(this.menu.children, el);
-    this.setSelectedIndex(index);
+    if (!el.hasAttribute('command')) {
+      this.setSelectedIndex(-1);
+    } else {
+      var index = Array.prototype.indexOf.call(this.menu.children, el);
+      this.setSelectedIndex(index);
+    }
   },
 
   handleMouseOut: function(e) {
     this.setSelectedIndex(-1);
   },
 
   handleMouseUp: function(e) {
     var item = this.getSelectedItem();
     if (item) {
       this.executeItem(item);
     }
   },
 
   handleKeyDown: function(e) {
     var item = this.getSelectedItem();
 
     var self = this;
     function selectNextVisible(m) {
       var children = self.menu.children;
       var len = children.length;
       var i = self.selectedIndex_;
       if (i == -1 && m == -1) {
         // Edge case when we need to go the last item fisrt.
         i = 0;
       }
       while (true) {
         i = (i + m + len) % len;
         item = children[i];
-        if (item && item.style.display != 'none') {
+        if (item && item.hasAttribute('command') &&
+            item.style.display != 'none') {
           break;
         }
       }
       if (item) {
         self.setSelectedIndex(i);
       }
     }
 
     switch (e.keyIdentifier) {
       case 'Down':
@@ skipping 44 matching lines @@
       }
       this.selectedIndex_ = i;
     }
   },
 
   getSelectedItem: function() {
     return this.menu.children[this.selectedIndex_] || null;
   },
 
   executeItem: function(item) {
-    var section = Section[item.getAttribute('section')];
-    var show = item.getAttribute('show') == 'true';
-    if (show) {
-      showSection(section);
-    } else {
-      hideSection(section);
+    var command = item.getAttribute('command');
+    if (command in this.commands) {
+      this.commands[command].call(this, item);
     }
 
     this.hide();
+  }
+};
+
+var optionMenu = new OptionMenu($('option-button'), $('option-menu'));
+optionMenu.commands = {
+  'clear-all-blacklisted' : function() {
+    mostVisited.clearAllBlacklisted();
+    chrome.send('getMostVisited');
+  },
+  'show': function(item) {
+    var section = Section[item.getAttribute('section')];
+    showSection(section);
+    saveShownSections();
+  },
+  'hide': function(item) {
+    var section = Section[item.getAttribute('section')];
+    hideSection(section);
     saveShownSections();
   }
 };
 
-var optionMenu = new OptionMenu($('option-button'), $('option-menu'));
-
 $('most-visited').addEventListener('click', function(e) {
   var target = e.target;
   if (hasClass(target, 'pin')) {
     mostVisited.togglePinned(mostVisited.getItem(target));
     e.preventDefault();
   } else if (hasClass(target, 'remove')) {
     mostVisited.blacklist(mostVisited.getItem(target));
     e.preventDefault();
   }
 });
@@ skipping 362 matching lines @@
     el.addEventListener('dragover', bind(this.handleDragOver, this));
     el.addEventListener('dragleave', bind(this.handleDragLeave, this));
     el.addEventListener('drop', bind(this.handleDrop, this));
     el.addEventListener('dragend', bind(this.handleDragEnd, this));
     el.addEventListener('drag', bind(this.handleDrag, this));
     el.addEventListener('mousedown', bind(this.handleMouseDown, this));
   }
 };
 
 dnd.init();