Bug 1237106 - Move the Font Inspector into the Inspector directory r=pbro

This commit is contained in:
Gabriel Luong 2016-01-05 21:06:53 -08:00
parent cf5309743b
commit 836d2bd2ff
21 changed files with 16 additions and 11 deletions

View File

@ -11,13 +11,13 @@
<head>
<title>&title;</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" href="font-inspector.css" type="text/css"/>
<link rel="stylesheet" href="fonts.css" type="text/css"/>
<link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
<link rel="stylesheet" href="chrome://devtools/skin/font-inspector.css" type="text/css"/>
<link rel="stylesheet" href="chrome://devtools/skin/fonts.css" type="text/css"/>
<script type="application/javascript;version=1.8" src="chrome://devtools/content/shared/theme-switching.js"/>
</head>
<body class="theme-sidebar devtools-monospace" role="application">
<script type="application/javascript;version=1.8" src="font-inspector.js"></script>
<script type="application/javascript;version=1.8" src="fonts.js"></script>
<div>
<div class="devtools-toolbar preview-input-toolbar">
<div class="devtools-searchbox">

View File

@ -4,4 +4,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DevToolsModules(
'fonts.js',
)
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

View File

@ -1,4 +1,4 @@
{
// Extend from the shared list of defined globals for mochitests.
"extends": "../../../.eslintrc.mochitests"
"extends": "../../../../.eslintrc.mochitests"
}

View File

@ -2,12 +2,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
// shared-head.js handles imports, constants, and utility functions
Services.scriptloader.loadSubScript("chrome://mochitests/content/browser/devtools/client/framework/test/shared-head.js", this);
const BASE_URI = "http://mochi.test:8888/browser/devtools/client/fontinspector/test/"
const BASE_URI = "http://mochi.test:8888/browser/devtools/client/inspector/fonts/test/";
/**
* Open the toolbox, with the inspector tool visible.

View File

@ -362,7 +362,7 @@ InspectorPanel.prototype = {
if (Services.prefs.getBoolPref("devtools.fontinspector.enabled") && this.canGetUsedFontFaces) {
this.sidebar.addTab("fontinspector",
"chrome://devtools/content/fontinspector/font-inspector.xhtml",
"chrome://devtools/content/inspector/fonts/fonts.xhtml",
"fontinspector" == defaultTab);
}

View File

@ -4,6 +4,7 @@
DIRS += [
'computed',
'fonts',
'layout',
'rules'
]

View File

@ -33,9 +33,9 @@ devtools.jar:
content/inspector/rules/rules.css (inspector/rules/rules.css)
content/inspector/layout/layout.js (inspector/layout/layout.js)
content/inspector/layout/layout.xhtml (inspector/layout/layout.xhtml)
content/fontinspector/font-inspector.js (fontinspector/font-inspector.js)
content/fontinspector/font-inspector.xhtml (fontinspector/font-inspector.xhtml)
content/fontinspector/font-inspector.css (fontinspector/font-inspector.css)
content/inspector/fonts/fonts.js (inspector/fonts/fonts.js)
content/inspector/fonts/fonts.xhtml (inspector/fonts/fonts.xhtml)
content/inspector/fonts/fonts.css (inspector/fonts/fonts.css)
content/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
content/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
content/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
@ -329,7 +329,7 @@ devtools.jar:
skin/images/cubic-bezier-swatch.png (themes/images/cubic-bezier-swatch.png)
skin/images/cubic-bezier-swatch@2x.png (themes/images/cubic-bezier-swatch@2x.png)
skin/images/undock@2x.png (themes/images/undock@2x.png)
skin/font-inspector.css (themes/font-inspector.css)
skin/fonts.css (themes/fonts.css)
skin/computed.css (themes/computed.css)
skin/images/arrow-e.png (themes/images/arrow-e.png)
skin/images/arrow-e@2x.png (themes/images/arrow-e@2x.png)

View File

@ -13,7 +13,6 @@ DIRS += [
'commandline',
'debugger',
'eyedropper',
'fontinspector',
'framework',
'inspector',
'jsonview',