Bugs 1286710 - Reps: Use correct ellipsis character "…" . r=Honza
draft
Bugs 1286710 - Reps: Use correct ellipsis character "…" . r=Honza
MozReview-Commit-ID: 6mpNrWhX6vc
--- a/devtools/client/shared/components/reps/array.js
+++ b/devtools/client/shared/components/reps/array.js
@@ -63,17 +63,17 @@ define(function (require, exports, modul
if (array.length > max + 1) {
items.pop();
let objectLink = this.props.objectLink || DOM.span;
items.push(Caption({
key: "more",
object: objectLink({
object: this.props.object
- }, "more...")
+ }, "more…")
}));
}
return items;
},
/**
* Returns true if the passed object is an array with additional (custom)
@@ -183,17 +183,17 @@ define(function (require, exports, modul
*/
let Reference = React.createFactory(React.createClass({
displayName: "Reference",
render: function () {
let tooltip = "Circular reference";
return (
DOM.span({title: tooltip},
- "[...]")
+ "[…]")
);
}
}));
function supportsObject(object, type) {
return Array.isArray(object) ||
Object.prototype.toString.call(object) === "[object Arguments]";
}
--- a/devtools/client/shared/components/reps/grip-array.js
+++ b/devtools/client/shared/components/reps/grip-array.js
@@ -89,17 +89,17 @@ define(function (require, exports, modul
if (array.length > max + 1) {
items.pop();
let objectLink = this.props.objectLink || span;
items.push(Caption({
key: "more",
object: objectLink({
object: this.props.object
- }, "more...")
+ }, "more…")
}));
}
return items;
},
render: function () {
let mode = this.props.mode || "short";
@@ -169,17 +169,17 @@ define(function (require, exports, modul
* Renders cycle references in an array.
*/
let Reference = React.createFactory(React.createClass({
displayName: "Reference",
render: function () {
return (
span({title: "Circular reference"},
- "[...]"
+ "[…]"
)
);
}
}));
function supportsObject(grip, type) {
if (!isGrip(grip)) {
return false;
--- a/devtools/client/shared/components/reps/grip.js
+++ b/devtools/client/shared/components/reps/grip.js
@@ -69,36 +69,36 @@ define(function (require, exports, modul
};
// Object members with non-empty values are preferred since it gives the
// user a better overview of the object.
let props = this.getProps(object, max, isInterestingProp);
if (props.length <= max) {
// There are not enough props yet (or at least, not enough props to
- // be able to know whether we should print "more..." or not).
+ // be able to know whether we should print "more…" or not).
// Let's display also empty members and functions.
props = props.concat(this.getProps(object, max, (t, value) => {
return !isInterestingProp(t, value);
}));
}
// getProps() can return max+1 properties (it can't return more)
// to indicate that there is more props than allowed. Remove the last
- // one and append 'more...' postfix in such case.
+ // one and append 'more…' postfix in such case.
if (props.length > max) {
props.pop();
let objectLink = this.props.objectLink || span;
props.push(Caption({
key: "more",
object: objectLink({
object: object
- }, "more...")
+ }, "more…")
}));
} else if (props.length > 0) {
// Remove the last comma.
// NOTE: do not change comp._store.props directly to update a property,
// it should be re-rendered or cloned with changed props
let last = props.length - 1;
props[last] = React.cloneElement(props[last], {
delim: ""
--- a/devtools/client/shared/components/reps/named-node-map.js
+++ b/devtools/client/shared/components/reps/named-node-map.js
@@ -50,17 +50,17 @@ define(function (require, exports, modul
if (items.length > max + 1) {
items.pop();
let objectLink = this.props.objectLink || span;
items.push(Caption({
key: "more",
object: objectLink({
object: this.props.object
- }, "more...")
+ }, "more…")
}));
}
return items;
},
propIterator: function (grip, max) {
max = max || 3;
--- a/devtools/client/shared/components/reps/object.js
+++ b/devtools/client/shared/components/reps/object.js
@@ -66,32 +66,32 @@ define(function (require, exports, modul
}
// Object members with non-empty values are preferred since it gives the
// user a better overview of the object.
let props = this.getProps(object, max, isInterestingProp);
if (props.length <= max) {
// There are not enough props yet (or at least, not enough props to
- // be able to know whether we should print "more..." or not).
+ // be able to know whether we should print "more…" or not).
// Let's display also empty members and functions.
props = props.concat(this.getProps(object, max, (t, value) => {
return !isInterestingProp(t, value);
}));
}
if (props.length > max) {
props.pop();
let objectLink = this.props.objectLink || span;
props.push(Caption({
key: "more",
object: objectLink({
object: object
- }, "more...")
+ }, "more…")
}));
} else if (props.length > 0) {
// Remove the last comma.
props[props.length - 1] = React.cloneElement(
props[props.length - 1], { delim: "" });
}
return props;
--- a/devtools/client/shared/components/test/mochitest/test_reps_array.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_array.html
@@ -90,44 +90,44 @@ window.onload = Task.async(function* ()
}
];
testRepRenderModes(modeTests, "testMaxProps", componentUnderTest, stub);
}
function testMoreThanMaxProps() {
const stub = Array(302).fill("foo");
- const defaultOutput = `["foo", "foo", "foo", more...]`;
+ const defaultOutput = `["foo", "foo", "foo", more…]`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
expectedOutput: `[302]`,
},
{
mode: "short",
expectedOutput: defaultOutput,
},
{
mode: "long",
- expectedOutput: `[${Array(300).fill("\"foo\"").join(", ")}, more...]`,
+ expectedOutput: `[${Array(300).fill("\"foo\"").join(", ")}, more…]`,
}
];
testRepRenderModes(modeTests, "testMoreThanMaxProps", componentUnderTest, stub);
}
function testRecursiveArray() {
let stub = [1];
stub.push(stub);
- const defaultOutput = `[1, [...]]`;
+ const defaultOutput = `[1, […]]`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
@@ -150,17 +150,17 @@ window.onload = Task.async(function* ()
let stub = [
{
p1: "s1",
p2: ["a1", "a2", "a3"],
p3: "s3",
p4: "s4"
}
];
- const defaultOutput = `[Object{p1: "s1", p3: "s3", p4: "s4", more...}]`;
+ const defaultOutput = `[Object{p1: "s1", p3: "s3", p4: "s4", more…}]`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
--- a/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_grip-array.html
@@ -91,37 +91,37 @@ window.onload = Task.async(function* ()
expectedOutput: defaultOutput,
}
];
testRepRenderModes(modeTests, testName, componentUnderTest, getGripStub(testName));
}
function testMoreThanMaxProps() {
- // Test array = `["test string"...] //301 items`
+ // Test array = `["test string"…] //301 items`
const testName = "testMoreThanMaxProps";
- const defaultOutput = `[${Array(3).fill("\"test string\"").join(", ")}, more...]`;
+ const defaultOutput = `[${Array(3).fill("\"test string\"").join(", ")}, more…]`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
expectedOutput: `[302]`,
},
{
mode: "short",
expectedOutput: defaultOutput,
},
{
mode: "long",
- expectedOutput: `[${Array(300).fill("\"test string\"").join(", ")}, more...]`,
+ expectedOutput: `[${Array(300).fill("\"test string\"").join(", ")}, more…]`,
}
];
testRepRenderModes(modeTests, testName, componentUnderTest, getGripStub(testName));
}
function testRecursiveArray() {
// @TODO This is not how this feature should actually work
--- a/devtools/client/shared/components/test/mochitest/test_reps_grip.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_grip.html
@@ -95,29 +95,29 @@ window.onload = Task.async(function* ()
expectedOutput: defaultOutput,
}
];
testRepRenderModes(modeTests, testName, componentUnderTest, getGripStub(testName));
}
function testMoreThanMaxProps() {
- // Test object = `{p0: "0", p1: "1", p2: "2", ..., p101: "101"}`
+ // Test object = `{p0: "0", p1: "1", p2: "2", …, p101: "101"}`
const testName = "testMoreThanMaxProps";
- const defaultOutput = `Object {p0: "0", p1: "1", p2: "2", more...}`;
+ const defaultOutput = `Object {p0: "0", p1: "1", p2: "2", more…}`;
// Generate string with 100 properties, which is the max limit
// for 'long' mode.
let props = "";
for (let i = 0; i < 100; i++) {
props += "p" + i + ": \"" + i + "\", ";
}
- const longOutput = `Object {${props}more...}`;
+ const longOutput = `Object {${props}more…}`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
@@ -135,17 +135,17 @@ window.onload = Task.async(function* ()
testRepRenderModes(modeTests, testName, componentUnderTest, getGripStub(testName));
}
function testUninterestingProps() {
// Test object: `{a: undefined, b: undefined, c: "c", d: 1}`
// @TODO This is not how we actually want the preview to be output.
// See https://bugzilla.mozilla.org/show_bug.cgi?id=1276376
- const expectedOutput = `Object {a: undefined, b: undefined, c: "c", more...}`;
+ const expectedOutput = `Object {a: undefined, b: undefined, c: "c", more…}`;
}
function testNestedObject() {
// Test object: `{objProp: {id: 1}, strProp: "test string"}`
const testName = "testNestedObject";
const defaultOutput = `Object {objProp: Object, strProp: "test string"}`;
--- a/devtools/client/shared/components/test/mochitest/test_reps_object.html
+++ b/devtools/client/shared/components/test/mochitest/test_reps_object.html
@@ -96,17 +96,17 @@ window.onload = Task.async(function* ()
testRepRenderModes(modeTests, "testMaxProps", componentUnderTest, stub);
}
function testMoreThanMaxProps() {
let stub = {};
for (let i = 0; i<100; i++) {
stub[`p${i}`] = i
}
- const defaultOutput = `Object{p0: 0, p1: 1, p2: 2, more...}`;
+ const defaultOutput = `Object{p0: 0, p1: 1, p2: 2, more…}`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",
@@ -122,17 +122,17 @@ window.onload = Task.async(function* ()
}
];
testRepRenderModes(modeTests, "testMoreThanMaxProps", componentUnderTest, stub);
}
function testUninterestingProps() {
const stub = {a:undefined, b:undefined, c:"c", d:0};
- const defaultOutput = `Object{c: "c", d: 0, a: undefined, more...}`;
+ const defaultOutput = `Object{c: "c", d: 0, a: undefined, more…}`;
const modeTests = [
{
mode: undefined,
expectedOutput: defaultOutput,
},
{
mode: "tiny",