Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1296389 - Part 1: Use the same markup structure as the old console frontend r=me

Browse Source 
MozReview-Commit-ID: 2YVe8jtdJSe

--HG--
extra : rebase_source : b69393f61ddd2ecbcae7122e38e500fa1f6f8471
This commit is contained in:
Jarda Snajdr 2016-08-22 12:39:15 +02:00
parent bc96691af0
commit 2132a5ef48
6 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
View File

@ -45,6 +45,15 @@ function ConsoleApiCall(props) {
const icon = MessageIcon({level});
const repeat = MessageRepeat({repeat: message.repeat});
const shouldRenderFrame = frame && frame.source !== "debugger eval code";
const location = dom.span({ className: "message-location devtools-monospace" },
shouldRenderFrame ? FrameView({
frame,
onClick: onViewSourceInDebugger,
showEmptyPathAsHost: true,
sourceMapService
}) : null
);
let collapse = "";
let attachment = "";
@ -83,7 +92,6 @@ function ConsoleApiCall(props) {
classes.push("open");
}
const shouldRenderFrame = frame && frame.source !== "debugger eval code";
return dom.div({
className: classes.join(" ")
},
@ -92,23 +100,14 @@ function ConsoleApiCall(props) {
icon,
collapse,
dom.span({className: "message-body-wrapper"},
dom.span({},
dom.span({className: "message-flex-body"},
dom.span({className: "message-body devtools-monospace"},
messageBody
),
repeat,
dom.span({ className: "message-location devtools-monospace" },
shouldRenderFrame ? FrameView({
frame,
onClick: onViewSourceInDebugger,
showEmptyPathAsHost: true,
sourceMapService
}) : null
)
dom.span({className: "message-flex-body"},
dom.span({className: "message-body devtools-monospace"},
messageBody
),
attachment
)
repeat,
location
),
attachment
)
);
}

8
devtools/client/webconsole/new-console-output/components/message-types/console-command.js
View File

@ -47,8 +47,12 @@ function ConsoleCommand(props) {
// @TODO add timestamp
// @TODO add indent if necessary
icon,
dom.span({className: "message-body-wrapper message-body devtools-monospace"},
dom.span({}, message.messageText)
dom.span({ className: "message-body-wrapper" },
dom.span({ className: "message-flex-body" },
dom.span({ className: "message-body devtools-monospace" },
message.messageText
)
)
)
);
}

9
devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
View File

@ -42,10 +42,11 @@ function EvaluationResult(props) {
// @TODO add timestamp
// @TODO add indent if needed with console.group
icon,
dom.span(
{className: "message-body-wrapper message-body devtools-monospace"},
dom.span({},
GripMessageBody({grip: message.parameters})
dom.span({ className: "message-body-wrapper" },
dom.span({ className: "message-flex-body" },
dom.span({ className: "message-body devtools-monospace" },
GripMessageBody({grip: message.parameters})
)
)
)
);

13
devtools/client/webconsole/new-console-output/components/message-types/page-error.js
View File

@ -52,13 +52,14 @@ function PageError(props) {
className: classes.join(" ")
},
icon,
dom.span(
{className: "message-body-wrapper message-body devtools-monospace"},
dom.span({},
message.messageText
dom.span({ className: "message-body-wrapper" },
dom.span({ className: "message-flex-body" },
dom.span({ className: "message-body devtools-monospace" },
message.messageText
),
repeat
)
),
repeat
)
);
}

2
devtools/client/webconsole/new-console-output/test/components/evaluation-result.test.js
View File

@ -25,6 +25,6 @@ describe("EvaluationResult component:", () => {
});
function getMessageBody(rendered) {
const queryPath = "div.message.cm-s-mozilla span.message-body-wrapper.message-body.devtools-monospace";
const queryPath = "div.message span.message-body-wrapper span.message-body";
return rendered.querySelector(queryPath);
}

2
devtools/client/webconsole/new-console-output/test/components/page-error.test.js
View File

@ -23,6 +23,6 @@ describe("PageError component:", () => {
});
function getMessageBody(rendered) {
const queryPath = "div.message span.message-body-wrapper.message-body.devtools-monospace";
const queryPath = "div.message span.message-body-wrapper span.message-body";
return rendered.querySelector(queryPath);
}