Bug 1405246 - Changed menu item Collapse to Collapse All. r=jdescottes
authorJoshua Longhi <joshualonghi@gmail.com>
Wed, 04 Oct 2017 18:28:26 -0400
changeset 384694 ebd010e955f77a1aaebbe32841913677579ad33c
parent 384693 e406513e25d22446dc371dcde62f1d93fd34a1b5
child 384695 ec392f5fdb2e5f124bb5d90adb0f71b6d928e0fb
push id95827
push userryanvm@gmail.com
push dateThu, 05 Oct 2017 14:57:27 +0000
treeherdermozilla-inbound@ebd010e955f7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes
bugs1405246
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1405246 - Changed menu item Collapse to Collapse All. r=jdescottes
devtools/client/inspector/inspector.js
devtools/client/locales/en-US/inspector.properties
--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@@ -1245,19 +1245,19 @@ Inspector.prototype = {
     menu.append(new MenuItem({
       id: "node-menu-expand",
       label: INSPECTOR_L10N.getStr("inspectorExpandNode.label"),
       disabled: !isNodeWithChildren,
       click: () => this.expandNode(),
     }));
     menu.append(new MenuItem({
       id: "node-menu-collapse",
-      label: INSPECTOR_L10N.getStr("inspectorCollapseNode.label"),
+      label: INSPECTOR_L10N.getStr("inspectorCollapseAll.label"),
       disabled: !isNodeWithChildren || !markupContainer.expanded,
-      click: () => this.collapseNode(),
+      click: () => this.collapseAll(),
     }));
 
     menu.append(new MenuItem({
       type: "separator",
     }));
 
     menu.append(new MenuItem({
       id: "node-menu-scrollnodeintoview",
@@ -1976,18 +1976,18 @@ Inspector.prototype = {
     let container = this.markup.getContainer(this.selection.nodeFront);
     container.removeAttribute(this.nodeMenuTriggerInfo.name);
   },
 
   expandNode: function () {
     this.markup.expandAll(this.selection.nodeFront);
   },
 
-  collapseNode: function () {
-    this.markup.collapseNode(this.selection.nodeFront);
+  collapseAll: function () {
+    this.markup.collapseAll(this.selection.nodeFront);
   },
 
   /**
    * This method is here for the benefit of the node-menu-link-follow menu item
    * in the inspector contextual-menu.
    */
   onFollowLink: function () {
     let type = this.contextMenuTarget.dataset.type;
--- a/devtools/client/locales/en-US/inspector.properties
+++ b/devtools/client/locales/en-US/inspector.properties
@@ -258,20 +258,20 @@ inspectorShowDOMProperties.label=Show DO
 # this item opens the split Console.
 inspectorUseInConsole.label=Use in Console
 
 # LOCALIZATION NOTE (inspectorExpandNode.label): This is the label
 # shown in the inspector contextual-menu for recursively expanding
 # mark-up elements
 inspectorExpandNode.label=Expand All
 
-# LOCALIZATION NOTE (inspectorCollapseNode.label): This is the label
+# LOCALIZATION NOTE (inspectorCollapseAll.label): This is the label
 # shown in the inspector contextual-menu for recursively collapsing
 # mark-up elements
-inspectorCollapseNode.label=Collapse
+inspectorCollapseAll.label=Collapse All
 
 # LOCALIZATION NOTE (inspectorScreenshotNode.label): This is the label
 # shown in the inspector contextual-menu for the item that lets users take
 # a screenshot of the currently selected node.
 inspectorScreenshotNode.label=Screenshot Node
 
 # LOCALIZATION NOTE (inspectorDuplicateNode.label): This is the label
 # shown in the inspector contextual-menu for the item that lets users