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

Bug 1237253 - Support define in BrowserLoader; r=jlongster r=jryans

Browse Source
This commit is contained in:
Jan Odvarko 2016-01-15 14:15:28 +01:00
parent 3161857339
commit e64b60457f
24 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/jsonview/components/headers-panel.js
View File

@ -6,7 +6,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./reps/rep-utils");
const { Headers } = createFactories(require("./headers"));
const { Toolbar, ToolbarButton } = createFactories(require("./reps/toolbar"));

2
devtools/client/jsonview/components/headers.js
View File

@ -6,7 +6,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
// Constants
const DOM = React.DOM;

2
devtools/client/jsonview/components/json-panel.js
View File

@ -6,7 +6,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./reps/rep-utils");
const { TreeView } = createFactories(require("./reps/tree-view"));
const { SearchBox } = createFactories(require("./search-box"));

2
devtools/client/jsonview/components/main-tabbed-area.js
View File

@ -8,7 +8,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./reps/rep-utils");
const { JsonPanel } = createFactories(require("./json-panel"));
const { TextPanel } = createFactories(require("./text-panel"));

2
devtools/client/jsonview/components/reps/array.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { Rep } = createFactories(require("./rep"));
const { ObjectBox } = createFactories(require("./object-box"));

2
devtools/client/jsonview/components/reps/caption.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;
/**

2
devtools/client/jsonview/components/reps/null.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { ObjectBox } = createFactories(require("./object-box"));

2
devtools/client/jsonview/components/reps/number.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { ObjectBox } = createFactories(require("./object-box"));

2
devtools/client/jsonview/components/reps/object-box.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;
/**

2
devtools/client/jsonview/components/reps/object-link.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;
/**

2
devtools/client/jsonview/components/reps/object.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { ObjectBox } = createFactories(require("./object-box"));
const { Caption } = createFactories(require("./caption"));

2
devtools/client/jsonview/components/reps/rep-utils.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
/**
* Create React factories for given arguments.

2
devtools/client/jsonview/components/reps/rep.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
// Load all existing rep templates
const { Undefined } = require("./undefined");

2
devtools/client/jsonview/components/reps/string.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { ObjectBox } = createFactories(require("./object-box"));

2
devtools/client/jsonview/components/reps/tabs.js
View File

@ -8,7 +8,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;
/**

2
devtools/client/jsonview/components/reps/toolbar.js
View File

@ -8,7 +8,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;
/**

2
devtools/client/jsonview/components/reps/tree-view.js
View File

@ -7,7 +7,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { Rep } = createFactories(require("./rep"));
const { StringRep } = require("./string");

2
devtools/client/jsonview/components/reps/undefined.js
View File

@ -9,7 +9,7 @@
define(function(require, exports, module) {
// Dependencies
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./rep-utils");
const { ObjectBox } = createFactories(require("./object-box"));

2
devtools/client/jsonview/components/search-box.js
View File

@ -8,7 +8,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const DOM = React.DOM;

2
devtools/client/jsonview/components/text-panel.js
View File

@ -6,7 +6,7 @@
define(function(require, exports, module) {
const React = require("react");
const React = require("devtools/client/shared/vendor/react");
const { createFactories } = require("./reps/rep-utils");
const { Toolbar, ToolbarButton } = createFactories(require("./reps/toolbar"));
const DOM = React.DOM;

4
devtools/client/jsonview/json-viewer.js
View File

@ -7,9 +7,7 @@
define(function(require, exports, module) {
// ReactJS
const ReactDOM = require("react-dom");
// RDP Inspector
const ReactDOM = require("devtools/client/shared/vendor/react-dom");
const { createFactories } = require("./components/reps/rep-utils");
const { MainTabbedArea } = createFactories(require("./components/main-tabbed-area"));

8
devtools/client/jsonview/viewer-config.js
View File

@ -16,15 +16,19 @@
*
* The path mapping uses paths fallback (a feature supported by RequireJS)
* See also: http://requirejs.org/docs/api.html#pathsfallbacks
*
* React module ID is using exactly the same (relative) path as the rest
* of the code base, so it's consistent and modules can be easily reused.
*/
require.config({
baseUrl: ".",
paths: {
"react": [
"devtools/client/shared/vendor/react": [
"resource://devtools/client/shared/vendor/react-dev",
"resource://devtools/client/shared/vendor/react"
],
"react-dom": "resource://devtools/client/shared/vendor/react-dom"
"devtools/client/shared/vendor/react-dom":
"resource://devtools/client/shared/vendor/react-dom"
}
});

13
devtools/client/shared/browser-loader.js
View File

@ -1,9 +1,15 @@
/* 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";
var { classes: Cc, interfaces: Ci, utils: Cu } = Components;
const loaders = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
const { devtools, DevToolsLoader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { joinURI } = devtools.require("devtools/shared/path");
const BROWSER_BASED_DIRS = [
"resource://devtools/client/jsonview",
"resource://devtools/client/shared/vendor",
"resource://devtools/client/shared/components",
"resource://devtools/client/shared/redux"
@ -54,6 +60,13 @@ function BrowserLoader(baseURI, window) {
}
return require(uri);
},
globals: {
// Make sure 'define' function exists. This allows reusing AMD modules.
define: function(callback) {
callback(this.require, this.exports, this.module);
return this.exports;
}
}
};

2
devtools/client/shared/vendor/react-dom.js vendored
View File

@ -6,7 +6,7 @@
// RequireJS
} else if (typeof define === "function" && define.amd) {
define(['react'], f);
define(['devtools/client/shared/vendor/react'], f);
// <script>
} else {