Skip to content

Commit 9dcab53

Browse files
author
Daniel Herzog
committed
Moved to overlay view for network-details
1 parent 1d83eb5 commit 9dcab53

File tree

3 files changed

+189
-277
lines changed

3 files changed

+189
-277
lines changed

src/network/network_details_templates.js

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,14 @@ templates._pre = function(content)
1313
return ["pre", content, "class", "mono"];
1414
};
1515

16-
templates.details = function(entry, left_val, do_raw, do_wrap)
16+
templates.details = function(entry, do_raw, do_wrap)
1717
{
1818
return (
1919
["div",
20-
[
21-
["span",
22-
"class", "resize-request-detail",
23-
"handler", "resize-request-detail"
24-
],
25-
["div",
26-
["div",
27-
this._details_headline(entry),
28-
this._details_content(entry, do_raw),
29-
"class", "table-cell"
30-
],
31-
"data-object-id", String(entry.id),
32-
"class", "entry-details"
33-
]
34-
],
35-
"class", "network-details-container" +
36-
(do_wrap ? " network-details-container-wrap" : ""),
37-
"style", "left:" + left_val + "px"]
20+
this._details_headline(entry),
21+
this._details_content(entry, do_raw),
22+
"class", "table-cell" + (do_wrap ? " wrap" : "")
23+
]
3824
);
3925
};
4026

@@ -117,7 +103,7 @@ templates._request = function(request, is_last, do_raw)
117103
// and didn't go on the network.
118104
var is_relevant = is_last && request.was_responded_to;
119105

120-
var expanded = window.settings.network_logger.get("expand-requests");
106+
var expanded = window.settings["network-detail-overlay"].get("expand-requests");
121107
var show_headline = is_relevant;
122108
var show_headers = is_relevant && expanded;
123109
var show_body = show_headers;
@@ -131,7 +117,7 @@ templates._request = function(request, is_last, do_raw)
131117

132118
templates._response = function(response, is_last, do_raw)
133119
{
134-
var expanded = window.settings.network_logger.get("expand-responses");
120+
var expanded = window.settings["network-detail-overlay"].get("expand-responses");
135121
var show_headline = response.logger_entry_touched_network;
136122
var show_headers = expanded && response.logger_entry_touched_network;
137123
var show_body = expanded;

src/network/network_style.css

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -244,35 +244,20 @@
244244
cursor: col-resize;
245245
}
246246

247-
.network-details-container
247+
.network-details-view
248248
{
249-
position: absolute;
250-
right: 0;
251-
top: 0;
252-
height: 100%;
253-
z-index: 2;
254-
left: 120px;
255-
background-color: #fff;
256-
box-shadow: 0 5px 6px rgba(0, 0, 0, 0.39),
257-
0 2px 2px 1px rgba(0, 0, 0, 0.28),
258-
-1px 0 0 rgba(0, 0, 0, 0.05);
259-
}
260-
261-
.network_logger .entry-details
262-
{
263-
overflow: auto;
264249
height: 100%;
265250
padding: 0 5px;
266251
box-sizing: border-box;
267252
overflow: auto;
268253
}
269254

270-
.network-details-container .table-cell
255+
.network-details-view .table-cell
271256
{
272257
display: table-cell;
273258
}
274259

275-
.network-details-container-wrap .table-cell
260+
.network-details-view .wrap /* that's .table-cell.wrap */
276261
{
277262
display: block;
278263
}
@@ -282,22 +267,22 @@
282267
white-space: pre;
283268
}
284269

285-
.network-details-container-wrap .method-and-url
270+
.network-details-view .wrap .method-and-url
286271
{
287272
word-wrap: break-word;
288273
}
289274

290-
.network-details-container .header-token-type-first_line_part
275+
.network-details-view .header-token-type-first_line_part
291276
{
292277
font-weight: bold;
293278
}
294279

295-
.network_logger .header-token-type-name
280+
.network-details-view .header-token-type-name
296281
{
297282
color: #149CBD;
298283
}
299284

300-
.network_logger .http-token-type-boundary
285+
.network-details-view .http-token-type-boundary
301286
{
302287
color: #7E7E7E;
303288
}
@@ -310,87 +295,87 @@
310295
color: #808080;
311296
}
312297

313-
.network-details-container pre,
314-
.network-details-container p
298+
.network-details-view pre,
299+
.network-details-view p
315300
{
316301
margin: 0;
317302
}
318303

319-
.network-details-container-wrap pre,
320-
.network-details-container-wrap p,
321-
.network-details-container-wrap td
304+
.network-details-view .wrap pre,
305+
.network-details-view .wrap p,
306+
.network-details-view .wrap td
322307
{
323308
word-wrap: break-word;
324309
white-space: pre;
325310
}
326311

327-
.network-details-container-wrap td
312+
.network-details-view .wrap td
328313
{
329314
/* not entirely sure why only pre-wrap helps here */
330315
white-space: pre-wrap;
331316
}
332317

333-
.network-details-container-wrap img {
318+
.network-details-view .wrap img {
334319
max-width: 100%;
335320
}
336321

337-
.network-details-container p
322+
.network-details-view p
338323
{
339324
font: 11px "menu";
340325
}
341326

342-
.network-details-container table
327+
.network-details-view table
343328
{
344329
border-collapse: collapse;
345330
}
346331

347-
.network-details-container table
332+
.network-details-view table
348333
{
349334
width: 1px;
350335
}
351336

352-
.network-details-container-wrap table
337+
.network-details-view .wrap table
353338
{
354339
width: 100%;
355340
}
356341

357-
.network-details-container td,
358-
.network-details-container th
342+
.network-details-view td,
343+
.network-details-view th
359344
{
360345
vertical-align: top;
361346
}
362347

363-
.network-details-container th
348+
.network-details-view th
364349
{
365350
text-align: left;
366351
white-space: nowrap;
367352
}
368353

369-
.network-details-container th:first-child,
370-
.network-details-container td:first-child
354+
.network-details-view th:first-child,
355+
.network-details-view td:first-child
371356
{
372357
width: 20%;
373358
padding-right: 30px;
374359
}
375360

376-
.network-details-container hr
361+
.network-details-view hr
377362
{
378363
border: none;
379364
border-top: 1px solid #a4a4a4;
380365
margin: 7px 0 -8px 0;
381366
}
382367

368+
.network-details-view div.header {
369+
margin: 0 0 0 -5px; /* todo: 10px 0 10px -5px; looks better to me but is inconsistent with dom panel headers */
370+
}
371+
383372
.request-crafter h2,
384373
.network-options h2
385374
{
386375
font-size: 125%;
387376
padding: 10px 0 5px 0;
388377
}
389378

390-
.network-details-container div.header {
391-
margin: 0 0 0 -5px; /* todo: 10px 0 10px -5px; looks better to me but is inconsistent with dom panel headers */
392-
}
393-
394379
.network_logger .network-main-container .sortable-table .network-graph-column
395380
{
396381
line-height: 0;

0 commit comments

Comments
 (0)