From 806745713ccab7fcada5c5d85df1344490a29d19 Mon Sep 17 00:00:00 2001
From: Dalimil Hajek <dalimilhajek@gmail.com>
Date: Fri, 15 Jul 2016 07:52:00 -0400
Subject: [PATCH] Bug 1244916 - JSON Viewer: empty arrays should hide the zero
 count. r=odvarko

---
 devtools/client/shared/components/reps/array.js               | 3 ++-
 devtools/client/shared/components/reps/grip-array.js          | 4 +++-
 .../shared/components/test/mochitest/test_reps_array.html     | 2 +-
 .../components/test/mochitest/test_reps_grip-array.html       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/devtools/client/shared/components/reps/array.js b/devtools/client/shared/components/reps/array.js
index ce025b95abd8..76fab50705bd 100644
--- a/devtools/client/shared/components/reps/array.js
+++ b/devtools/client/shared/components/reps/array.js
@@ -127,7 +127,8 @@ define(function (require, exports, module) {
       let items;
 
       if (mode == "tiny") {
-        items = DOM.span({className: "length"}, object.length);
+        let isEmpty = object.length === 0;
+        items = DOM.span({className: "length"}, isEmpty ? "" : object.length);
       } else {
         let max = (mode == "short") ? 3 : 300;
         items = this.arrayIterator(object, max);
diff --git a/devtools/client/shared/components/reps/grip-array.js b/devtools/client/shared/components/reps/grip-array.js
index 74971d7ccf14..70e6dcec325f 100644
--- a/devtools/client/shared/components/reps/grip-array.js
+++ b/devtools/client/shared/components/reps/grip-array.js
@@ -108,7 +108,9 @@ define(function (require, exports, module) {
       let items;
 
       if (mode == "tiny") {
-        items = span({className: "length"}, this.getLength(object));
+        let objectLength = this.getLength(object);
+        let isEmpty = objectLength === 0;
+        items = span({className: "length"}, isEmpty ? "" : objectLength);
       } else {
         let max = (mode == "short") ? 3 : 300;
         items = this.arrayIterator(object, max);
diff --git a/devtools/client/shared/components/test/mochitest/test_reps_array.html b/devtools/client/shared/components/test/mochitest/test_reps_array.html
index 527309bae4df..0bb56cda09ed 100644
--- a/devtools/client/shared/components/test/mochitest/test_reps_array.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_array.html
@@ -64,7 +64,7 @@ window.onload = Task.async(function* () {
       },
       {
         mode: "tiny",
-        expectedOutput: `[0]`,
+        expectedOutput: `[]`,
       },
       {
         mode: "short",
diff --git a/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html b/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html
index a93c1dc20381..be6fe69db421 100644
--- a/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html
@@ -57,7 +57,7 @@ window.onload = Task.async(function* () {
       },
       {
         mode: "tiny",
-        expectedOutput: `[0]`,
+        expectedOutput: `[]`,
       },
       {
         mode: "short",