Bug 1247203 - Stop exporting useless symbols of of devtools/client/main. r=jryans

This commit is contained in:
Alexandre Poirot 2016-03-04 07:51:11 -08:00
parent 2dbed66d15
commit fc8a7748f7
4 changed files with 3 additions and 8 deletions

View File

@ -10,7 +10,7 @@
const {Cc, Ci, Cu} = require("chrome");
const ToolDefinitions = require("devtools/client/main").Tools;
const ToolDefinitions = require("devtools/client/definitions").Tools;
const {CssLogic} = require("devtools/shared/inspector/css-logic");
const {ELEMENT_STYLE} = require("devtools/server/actors/styles");
const promise = require("promise");

View File

@ -10,7 +10,7 @@
const {Cc, Ci, Cu} = require("chrome");
const promise = require("promise");
const Services = require("Services");
const {Tools} = require("devtools/client/main");
const {Tools} = require("devtools/client/definitions");
const {setTimeout, clearTimeout} =
Cu.import("resource://gre/modules/Timer.jsm", {});
const {CssLogic} = require("devtools/shared/inspector/css-logic");

View File

@ -12,11 +12,6 @@ const { defaultTools, defaultThemes } = require("devtools/client/definitions");
defaultTools.forEach(definition => gDevTools.registerTool(definition));
defaultThemes.forEach(definition => gDevTools.registerTheme(definition));
// Re-export for backwards compatibility, but we should probably the
// definitions from require("devtools/client/definitions") in the future
exports.defaultTools = require("devtools/client/definitions").defaultTools;
exports.defaultThemes = require("devtools/client/definitions").defaultThemes;
exports.Tools = require("devtools/client/definitions").Tools;
Object.defineProperty(exports, "Toolbox", {
get: () => require("devtools/client/framework/toolbox").Toolbox

View File

@ -9,7 +9,7 @@ const TEST_URI = "data:text/html;charset=utf8,<p>test Scratchpad panel " +
"linking</p>";
var { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
var { Tools } = require("devtools/client/main");
var { Tools } = require("devtools/client/definitions");
var { isTargetSupported } = Tools.scratchpad;
function pushPrefEnv() {