Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 0b49523fc19d (bug 1316291)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-02-17 18:47:16 +01:00
parent cce11640ab
commit b7335ca0a0
10 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devtools/client/netmonitor/components/toolbar.js
View File

@ -96,11 +96,12 @@ const Toolbar = createClass({
.replace("#4", getTimeWithDecimals(millis / 1000));
let buttons = requestFilterTypes.map(([type, checked]) => {
let classList = ["devtools-button", `requests-list-filter-${type}-button`];
let classList = ["devtools-button"];
checked && classList.push("checked");
return (
button({
id: `requests-list-filter-${type}-button`,
className: classList.join(" "),
key: type,
onClick: this.toggleRequestFilterType,
@ -117,7 +118,8 @@ const Toolbar = createClass({
span({ className: "devtools-toolbar devtools-toolbar-container" },
span({ className: "devtools-toolbar-group" },
button({
className: "devtools-button devtools-clear-icon requests-list-clear-button",
id: "requests-list-clear-button",
className: "devtools-button devtools-clear-icon",
title: TOOLBAR_CLEAR,
onClick: clearRequests,
}),
@ -125,7 +127,8 @@ const Toolbar = createClass({
),
span({ className: "devtools-toolbar-group" },
button({
className: "devtools-button requests-list-network-summary-button",
id: "requests-list-network-summary-button",
className: "devtools-button",
title: count ? text : L10N.getStr("netmonitor.toolbar.perf"),
onClick: openStatistics,
},

2
devtools/client/netmonitor/test/browser_net_clear.js
View File

@ -16,7 +16,7 @@ add_task(function* () {
let { EVENTS } = windowRequire("devtools/client/netmonitor/events");
let detailsPane = document.querySelector("#details-pane");
let detailsPanelToggleButton = document.querySelector(".network-details-panel-toggle");
let clearButton = document.querySelector(".requests-list-clear-button");
let clearButton = document.querySelector("#requests-list-clear-button");
gStore.dispatch(Actions.batchEnable(false));

64
devtools/client/netmonitor/test/browser_net_filter-01.js
View File

@ -166,94 +166,94 @@ add_task(function* () {
testContents([1, 1, 1, 1, 1, 1, 1, 1, 1]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
testFilterButtons(monitor, "html");
testContents([1, 0, 0, 0, 0, 0, 0, 0, 0]);
// Reset filters
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
document.querySelector("#requests-list-filter-css-button"));
testFilterButtons(monitor, "css");
testContents([0, 1, 0, 0, 0, 0, 0, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-js-button"));
document.querySelector("#requests-list-filter-js-button"));
testFilterButtons(monitor, "js");
testContents([0, 0, 1, 0, 0, 0, 0, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-xhr-button"));
document.querySelector("#requests-list-filter-xhr-button"));
testFilterButtons(monitor, "xhr");
testContents([1, 1, 1, 1, 1, 1, 1, 1, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-fonts-button"));
document.querySelector("#requests-list-filter-fonts-button"));
testFilterButtons(monitor, "fonts");
testContents([0, 0, 0, 1, 0, 0, 0, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-images-button"));
document.querySelector("#requests-list-filter-images-button"));
testFilterButtons(monitor, "images");
testContents([0, 0, 0, 0, 1, 0, 0, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-media-button"));
document.querySelector("#requests-list-filter-media-button"));
testFilterButtons(monitor, "media");
testContents([0, 0, 0, 0, 0, 1, 1, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-flash-button"));
document.querySelector("#requests-list-filter-flash-button"));
testFilterButtons(monitor, "flash");
testContents([0, 0, 0, 0, 0, 0, 0, 1, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-ws-button"));
document.querySelector("#requests-list-filter-ws-button"));
testFilterButtons(monitor, "ws");
testContents([0, 0, 0, 0, 0, 0, 0, 0, 1]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
testFilterButtons(monitor, "all");
testContents([1, 1, 1, 1, 1, 1, 1, 1, 1]);
// Text in filter box that matches nothing should hide all.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
setFreetextFilter("foobar");
testContents([0, 0, 0, 0, 0, 0, 0, 0, 0]);
// Text in filter box that matches should filter out everything else.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
setFreetextFilter("sample");
testContents([1, 1, 1, 0, 0, 0, 0, 0, 0]);
// Text in filter box that matches should filter out everything else.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
setFreetextFilter("SAMPLE");
testContents([1, 1, 1, 0, 0, 0, 0, 0, 0]);
// Test negative filtering (only show unmatched items)
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
setFreetextFilter("-sample");
testContents([0, 0, 0, 1, 1, 1, 1, 1, 1]);
@ -262,9 +262,9 @@ add_task(function* () {
// Enable filtering for html and css; should show request of both type.
setFreetextFilter("");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
document.querySelector("#requests-list-filter-css-button"));
testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]);
testContents([1, 1, 0, 0, 0, 0, 0, 0, 0]);
@ -274,35 +274,35 @@ add_task(function* () {
testContents([1, 1, 0, 0, 0, 0, 0, 0, 0]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-flash-button"));
document.querySelector("#requests-list-filter-flash-button"));
setFreetextFilter("");
testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0]);
testContents([1, 1, 0, 0, 0, 0, 0, 1, 0]);
// Disable some filters. Only one left active.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
document.querySelector("#requests-list-filter-css-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-flash-button"));
document.querySelector("#requests-list-filter-flash-button"));
testFilterButtons(monitor, "html");
testContents([1, 0, 0, 0, 0, 0, 0, 0, 0]);
// Disable last active filter. Should toggle to all.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
testFilterButtons(monitor, "all");
testContents([1, 1, 1, 1, 1, 1, 1, 1, 1]);
// Enable few filters and click on all. Only "all" should be checked.
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
document.querySelector("#requests-list-filter-css-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-ws-button"));
document.querySelector("#requests-list-filter-ws-button"));
testFilterButtonsCustom(monitor, [0, 1, 1, 0, 0, 0, 0, 0, 0, 1]);
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
testFilterButtons(monitor, "all");
testContents([1, 1, 1, 1, 1, 1, 1, 1, 1]);

4
devtools/client/netmonitor/test/browser_net_filter-02.js
View File

@ -166,7 +166,7 @@ add_task(function* () {
info("Testing html filtering.");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
testFilterButtons(monitor, "html");
testContents([1, 0, 0, 0, 0, 0, 0, 0, 0]);
@ -191,7 +191,7 @@ add_task(function* () {
info("Resetting filters.");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
document.querySelector("#requests-list-filter-all-button"));
testFilterButtons(monitor, "all");
testContents([1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]);

2
devtools/client/netmonitor/test/browser_net_filter-03.js
View File

@ -70,7 +70,7 @@ add_task(function* () {
info("Testing html filtering.");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
testFilterButtons(monitor, "html");
testContents([6, 4, 5, 0, 1, 2, 3], 1, 6);

6
devtools/client/netmonitor/test/browser_net_footer-summary.js
View File

@ -35,7 +35,7 @@ add_task(function* () {
let buttons = ["html", "css", "js", "xhr", "fonts", "images", "media", "flash"];
for (let button of buttons) {
let buttonEl = document.querySelector(`.requests-list-filter-${button}-button`);
let buttonEl = document.querySelector(`#requests-list-filter-${button}-button`);
EventUtils.sendMouseEvent({ type: "click" }, buttonEl);
testStatus();
}
@ -44,8 +44,8 @@ add_task(function* () {
yield teardown(monitor);
function testStatus() {
let value = document.querySelector(".requests-list-network-summary-button").textContent;
info("Current summary: " + value);
let value = document.querySelector("#requests-list-network-summary-button").textContent;
info("Current summary: " + value);
let state = gStore.getState();
let totalRequestsCount = state.requests.requests.size;

10
devtools/client/netmonitor/test/browser_net_statistics-02.js
View File

@ -17,15 +17,15 @@ add_task(function* () {
let Actions = windowRequire("devtools/client/netmonitor/actions/index");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-html-button"));
document.querySelector("#requests-list-filter-html-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-css-button"));
document.querySelector("#requests-list-filter-css-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-js-button"));
document.querySelector("#requests-list-filter-js-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-ws-button"));
document.querySelector("#requests-list-filter-ws-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-other-button"));
document.querySelector("#requests-list-filter-other-button"));
testFilterButtonsCustom(monitor, [0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1]);
info("The correct filtering predicates are used before entering perf. analysis mode.");

4
devtools/client/netmonitor/test/components/filter-buttons.test.js
View File

@ -94,8 +94,8 @@ function asExpected(wrapper, expectTypes, description) {
let className = expectTypes[type] ?
"devtools-button checked" : "devtools-button";
it(`'${type}' button is ${checked} ${description}`, () => {
expect(wrapper.find(`.requests-list-filter-${type}-button`).html())
.toBe(`<button class="` + className +
expect(wrapper.find(`#requests-list-filter-${type}-button`).html())
.toBe(`<button id="requests-list-filter-${type}-button" class="` + className +
`" data-key="${type}">netmonitor.toolbar.filter.${type}</button>`);
});
}

2
devtools/client/netmonitor/test/head.js
View File

@ -385,7 +385,7 @@ function waitFor(subject, eventName) {
*/
function testFilterButtons(monitor, filterType) {
let doc = monitor.panelWin.document;
let target = doc.querySelector(".requests-list-filter-" + filterType + "-button");
let target = doc.querySelector("#requests-list-filter-" + filterType + "-button");
ok(target, `Filter button '${filterType}' was found`);
let buttons = [...doc.querySelectorAll("#requests-list-filter-buttons button")];
ok(buttons.length > 0, "More than zero filter buttons were found");

20
devtools/client/themes/netmonitor.css
View File

@ -119,17 +119,17 @@
/* Network requests table */
.requests-list-toolbar {
#requests-list-toolbar {
display: flex;
padding: 0;
}
.requests-list-filter-buttons {
#requests-list-filter-buttons {
display: flex;
flex-wrap: nowrap;
}
.theme-firebug .requests-list-toolbar {
.theme-firebug #requests-list-toolbar {
height: 19px !important;
}
@ -805,7 +805,7 @@
/* Performance analysis buttons */
.requests-list-network-summary-button {
#requests-list-network-summary-button {
display: flex;
flex-wrap: nowrap;
align-items: center;
@ -818,7 +818,7 @@
min-width: 0;
}
.requests-list-network-summary-button > .summary-info-icon {
#requests-list-network-summary-button > .summary-info-icon {
background-image: url(images/profiler-stopwatch.svg);
filter: var(--icon-filter);
width: 16px;
@ -826,13 +826,13 @@
opacity: 0.8;
}
.requests-list-network-summary-button > .summary-info-text {
#requests-list-network-summary-button > .summary-info-text {
opacity: 0.8;
margin-inline-start: 0.5em;
}
.requests-list-network-summary-button:hover > .summary-info-icon,
.requests-list-network-summary-button:hover > .summary-info-text {
#requests-list-network-summary-button:hover > .summary-info-icon,
#requests-list-network-summary-button:hover > .summary-info-text {
opacity: 1;
}
@ -1010,11 +1010,11 @@
@media (max-width: 700px) {
#toolbar-spacer,
.network-details-panel-toggle,
.requests-list-network-summary-button > .summary-info-text {
#requests-list-network-summary-button > .summary-info-text {
display: none;
}
.requests-list-toolbar {
#requests-list-toolbar {
height: 22px;
}