Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 17:55:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 99f6b31d5f44 (bug 1396784)

Browse Source
This commit is contained in:
Sebastian Hengst 2017-09-14 00:26:31 +02:00
parent 45bab258b7
commit f993a75f2a
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devtools/client/inspector/inspector.js
View File

@ -23,6 +23,7 @@ const Store = require("devtools/client/inspector/store");
loader.lazyRequireGetter(this, "initCssProperties", "devtools/shared/fronts/css-properties", true);
loader.lazyRequireGetter(this, "HTMLBreadcrumbs", "devtools/client/inspector/breadcrumbs", true);
loader.lazyRequireGetter(this, "KeyShortcuts", "devtools/client/shared/key-shortcuts");
loader.lazyRequireGetter(this, "GridInspector", "devtools/client/inspector/grids/grid-inspector");
loader.lazyRequireGetter(this, "InspectorSearch", "devtools/client/inspector/inspector-search", true);
loader.lazyRequireGetter(this, "ToolSidebar", "devtools/client/inspector/toolsidebar", true);
loader.lazyRequireGetter(this, "MarkupView", "devtools/client/inspector/markup/markup");
@ -626,6 +627,10 @@ Inspector.prototype = {
INSPECTOR_L10N.getStr("inspector.sidebar.computedViewTitle"),
defaultTab == "computedview");
// Grid and layout panels aren't lazy-loaded as their module end up
// calling inspector.addSidebarTab
this.gridInspector = new GridInspector(this, this.panelWin);
// Inject a lazy loaded react tab by exposing a fake React object
// with a lazy defined Tab thanks to `panel` being a function
let layoutId = "layoutview";
@ -1068,6 +1073,10 @@ Inspector.prototype = {
}
this._panels.clear();
if (this.gridInspector) {
this.gridInspector.destroy();
}
if (this.layoutview) {
this.layoutview.destroy();
}

7
devtools/client/inspector/layout/layout.js
View File

@ -21,8 +21,6 @@ const PROMOTE_COUNT_PREF = "devtools.promote.layoutview";
// @remove after release 56 (See Bug 1355747)
const GRID_LINK = "https://www.mozilla.org/en-US/developer/css-grid/?utm_source=gridtooltip&utm_medium=devtools&utm_campaign=cssgrid_layout";
loader.lazyRequireGetter(this, "GridInspector", "devtools/client/inspector/grids/grid-inspector");
function LayoutView(inspector, window) {
this.document = window.document;
this.inspector = inspector;
@ -52,7 +50,6 @@ LayoutView.prototype = {
onToggleGeometryEditor,
} = this.inspector.getPanel("boxmodel").getComponentProps();
this.gridInspector = new GridInspector(this.inspector, this.inspector.panelWin);
let {
getSwatchColorPickerTooltip,
onSetGridOverlayColor,
@ -63,7 +60,7 @@ LayoutView.prototype = {
onToggleShowGridAreas,
onToggleShowGridLineNumbers,
onToggleShowInfiniteLines,
} = this.gridInspector.getComponentProps();
} = this.inspector.gridInspector.getComponentProps();
let {
onPromoteLearnMoreClick,
@ -112,8 +109,6 @@ LayoutView.prototype = {
* Destruction function called when the inspector is destroyed. Cleans up references.
*/
destroy() {
this.gridInspector.destroy();
this.document = null;
this.inspector = null;
this.store = null;

2
devtools/client/inspector/test/shared-head.js
View File

@ -136,7 +136,7 @@ function openLayoutView() {
toolbox: data.toolbox,
inspector: data.inspector,
boxmodel: data.inspector.getPanel("boxmodel"),
gridInspector: data.inspector.layoutview.gridInspector,
gridInspector: data.inspector.gridInspector,
testActor: data.testActor
};
});