Skip to content

Adjust report-renderer init for devtools #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulirish merged 8 commits into from
Apr 14, 2017
Merged

Adjust report-renderer init for devtools #2002

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
625f5ba
Adjust report-renderer init for devtools
paulirish Apr 13, 2017
f9033ae
feedback.
paulirish Apr 14, 2017
4ae044a
tests.
paulirish Apr 14, 2017
96897b9
feedback and align with 2002
paulirish Apr 14, 2017
15fe668
typedefs on lock. and setTemplateContext
paulirish Apr 14, 2017
70b50cc
tests for cloneTemplate.
paulirish Apr 14, 2017
0765b35
tests for renderer.setTemplateContext
paulirish Apr 14, 2017
46db6a3
feedback and compile in devtools is good.
paulirish Apr 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feedback.
  • Loading branch information
@paulirish
paulirish committed Apr 14, 2017
commit f9033ae537d9dceeb025e3edd2d88e8bd5e65ab6
2 changes: 1 addition & 1 deletion lighthouse-core/report/v2/renderer/details-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class DetailsRenderer {

if (typeof module !== 'undefined' && module.exports) {
module.exports = DetailsRenderer;
} else if (self) {
} else {
self.DetailsRenderer = DetailsRenderer;
}

Expand Down
2 changes: 1 addition & 1 deletion lighthouse-core/report/v2/renderer/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,6 @@ class DOM {

if (typeof module !== 'undefined' && module.exports) {
module.exports = DOM;
} else if (self) {
} else {
self.DOM = DOM;
}
8 changes: 4 additions & 4 deletions lighthouse-core/report/v2/renderer/report-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ function formatNumber(number) {

class ReportRenderer {
/**
* @param {!Document} document
* @param {!DOM} DOM
* @param {!DetailsRenderer} DetailsRenderer
Copy link
Contributor

@ebidel ebidel Apr 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lowercase the var names

*/
constructor(document, DOM, DetailsRenderer) {
this._detailsRenderer = new DetailsRenderer(this._dom);
constructor(dom, detailsRenderer) {
this._dom = dom;
this._detailsRenderer = detailsRenderer;
}

/**
Expand Down Expand Up @@ -198,7 +198,7 @@ class ReportRenderer {

if (typeof module !== 'undefined' && module.exports) {
module.exports = ReportRenderer;
} else if (self) {
} else {
self.ReportRenderer = ReportRenderer;
}

Expand Down
7 changes: 5 additions & 2 deletions lighthouse-core/report/v2/report-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@
<script>%%LIGHTHOUSE_JAVASCRIPT%%</script>
<script>window.__LIGHTHOUSE_JSON__ = %%LIGHTHOUSE_JSON%%;</script>
<script>
const renderer = new ReportRenderer(document, DOM, DetailsRenderer);
document.body.appendChild(renderer.renderReport(window.__LIGHTHOUSE_JSON__));
const dom = new DOM(document);
Copy link
Contributor

@ebidel ebidel Apr 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha, DI! I feel like we'll have to move more implementation out as time goes on. I guess it's fine for now.

const detailsRenderer = new DetailsRenderer(dom);
const renderer = new ReportRenderer(dom, detailsRenderer);
const reportElem = renderer.renderReport(window.__LIGHTHOUSE_JSON__);
document.body.appendChild(reportElem);
</script>
</body>
</html>