Backed out changeset 1e70c2d4173d (bug 1561362) for eslint failure on JsonToolbar.js. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Tue, 24 Mar 2020 10:21:30 +0200
changeset 520187 cbe6a9e7a2eac1308d5548e0d3df4c55e36d675c
parent 520186 1332b0d2dcba87d5e674c6656175e3ecd73ed85f
child 520188 230662ec61ed9a8f4c60c97a0e09b1f4295967d2
push id37245
push useropoprus@mozilla.com
push dateTue, 24 Mar 2020 21:46:41 +0000
treeherdermozilla-central@dbabf2e388fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1561362
milestone76.0a1
backs out1e70c2d4173d43dc252df5da61a17d6d80c92781
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
Backed out changeset 1e70c2d4173d (bug 1561362) for eslint failure on JsonToolbar.js. CLOSED TREE
devtools/client/jsonview/components/JsonToolbar.js
devtools/client/locales/en-US/jsonview.properties
--- a/devtools/client/jsonview/components/JsonToolbar.js
+++ b/devtools/client/jsonview/components/JsonToolbar.js
@@ -68,22 +68,22 @@ define(function(require, exports, module
         ToolbarButton(
           { className: "btn copy", onClick: this.onCopy },
           JSONView.Locale["jsonViewer.Copy"]
         ),
         ToolbarButton(
           { className: "btn collapse", onClick: this.onCollapse },
           JSONView.Locale["jsonViewer.CollapseAll"]
         ),
-        ToolbarButton(
-          { className: "btn expand", onClick: this.onExpand },
-            this.props.dataSize > EXPAND_THRESHOLD ? 
-              JSONView.Locale["jsonViewer.ExpandAllSlow"] :
+        this.props.dataSize > EXPAND_THRESHOLD
+          ? undefined
+          : ToolbarButton(
+              { className: "btn expand", onClick: this.onExpand },
               JSONView.Locale["jsonViewer.ExpandAll"]
-        ),
+            ),
         div({ className: "devtools-separator" }),
         SearchBox({
           actions: this.props.actions,
         })
       );
     }
   }
 
--- a/devtools/client/locales/en-US/jsonview.properties
+++ b/devtools/client/locales/en-US/jsonview.properties
@@ -26,17 +26,16 @@ jsonViewer.requestHeaders=Request Header
 # LOCALIZATION NOTE (jsonViewer.Save): Label for save command
 jsonViewer.Save=Save
 
 # LOCALIZATION NOTE (jsonViewer.Copy): Label for clipboard copy command
 jsonViewer.Copy=Copy
 
 # LOCALIZATION NOTE (jsonViewer.ExpandAll): Label for expanding all nodes
 jsonViewer.ExpandAll=Expand All
-jsonViewer.ExpandAllSlow=Expand All (slow)
 
 # LOCALIZATION NOTE (jsonViewer.CollapseAll): Label for collapsing all nodes
 jsonViewer.CollapseAll=Collapse All
 
 # LOCALIZATION NOTE (jsonViewer.PrettyPrint): Label for JSON
 # pretty print action button.
 jsonViewer.PrettyPrint=Pretty Print