Bug 870388 - Support <hr> separators in <menu>. r=mrbkap

iaxat · Aug 19, 2016 · 7ec8858 · 7ec8858
1 parent 282523d
commit 7ec8858
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/dom/html/HTMLMenuElement.cpp b/dom/html/HTMLMenuElement.cpp
@@ -226,6 +226,8 @@ HTMLMenuElement::TraverseContent(nsIContent* aContent,
       aBuilder->AddItemFor(menuitem, CanLoadIcon(child, icon));
 
       aSeparator = ST_FALSE;
+    } else if (child->IsHTMLElement(nsGkAtoms::hr)) {
+      aBuilder->AddSeparator();
     } else if (child->IsHTMLElement(nsGkAtoms::menu) && !element->IsHidden()) {
       if (child->HasAttr(kNameSpaceID_None, nsGkAtoms::label)) {
         nsAutoString label;

diff --git a/dom/html/test/browser_content_contextmenu_userinput.js b/dom/html/test/browser_content_contextmenu_userinput.js
@@ -23,7 +23,12 @@ add_task(function* () {
     let pageMenuSep = document.getElementById("page-menu-separator");
     ok(pageMenuSep && !pageMenuSep.hidden,
        "Page menu separator should be shown");
-    let testMenuItem = pageMenuSep.previousSibling;
+
+    let testMenuSep = pageMenuSep.previousSibling;
+    ok(testMenuSep && !testMenuSep.hidden,
+       "User-added menu separator should be shown");
+
+    let testMenuItem = testMenuSep.previousSibling;
     is(testMenuItem.label, "Test Context Menu Click", "Got context menu item");
 
     let promiseCtxMenuClick = ContentTask.spawn(aBrowser, null, function*() {

diff --git a/dom/html/test/file_content_contextmenu.html b/dom/html/test/file_content_contextmenu.html
@@ -13,7 +13,8 @@
 </head>
 <body contextmenu="testmenu">
   <menu type="context" id="testmenu">
-    <menuitem label="Test Context Menu Click" id="menuitem">
+    <menuitem label="Test Context Menu Click" id="menuitem"></menuitem>
+    <hr>
   </menu>
 </body>
 </html>