Bug 1350215 - Move store.js into utils/store.js r?honza,gasolin
MozReview-Commit-ID: BmEktkb2QXt
--- a/devtools/client/netmonitor/moz.build
+++ b/devtools/client/netmonitor/moz.build
@@ -13,16 +13,15 @@ DIRS += [
]
DevToolsModules(
'constants.js',
'netmonitor-controller.js',
'panel.js',
'request-list-context-menu.js',
'request-list-tooltip.js',
- 'store.js',
'waterfall-background.js',
)
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
with Files('**'):
BUG_COMPONENT = ('Firefox', 'Developer Tools: Netmonitor')
--- a/devtools/client/netmonitor/netmonitor.js
+++ b/devtools/client/netmonitor/netmonitor.js
@@ -15,17 +15,17 @@ var Netmonitor = {
window,
commonLibRequire: toolbox.browserRequire,
}).require;
const EventEmitter = require("devtools/shared/event-emitter");
const { createFactory } = require("devtools/client/shared/vendor/react");
const { render } = require("devtools/client/shared/vendor/react-dom");
const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
- const { configureStore } = require("./store");
+ const { configureStore } = require("./utils/create-store");
const store = window.gStore = configureStore();
const { NetMonitorController } = require("./netmonitor-controller");
this.NetMonitorController = NetMonitorController;
// Inject EventEmitter into netmonitor window.
EventEmitter.decorate(window);
// Components
deleted file mode 100644
--- a/devtools/client/netmonitor/store.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 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";
-
-const { createStore, applyMiddleware } = require("devtools/client/shared/vendor/redux");
-const { thunk } = require("devtools/client/shared/redux/middleware/thunk");
-const batching = require("./middleware/batching");
-const prefs = require("./middleware/prefs");
-const rootReducer = require("./reducers/index");
-const { Prefs } = require("./utils/prefs");
-const { FilterTypes, Filters } = require("./reducers/filters");
-const { Requests } = require("./reducers/requests");
-const { Sort } = require("./reducers/sort");
-const { TimingMarkers } = require("./reducers/timing-markers");
-const { UI } = require("./reducers/ui");
-
-function configureStore() {
- let activeFilters = {};
- Prefs.filters.forEach((filter) => {
- activeFilters[filter] = true;
- });
- const initialState = {
- filters: new Filters({
- requestFilterTypes: new FilterTypes(activeFilters)
- }),
- requests: new Requests(),
- sort: new Sort(),
- timingMarkers: new TimingMarkers(),
- ui: new UI()
- };
-
- return createStore(
- rootReducer,
- initialState,
- applyMiddleware(
- thunk,
- prefs,
- batching
- )
- );
-}
-
-exports.configureStore = configureStore;
new file mode 100644
--- /dev/null
+++ b/devtools/client/netmonitor/utils/create-store.js
@@ -0,0 +1,45 @@
+/* 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";
+
+const { createStore, applyMiddleware } = require("devtools/client/shared/vendor/redux");
+const { thunk } = require("devtools/client/shared/redux/middleware/thunk");
+const batching = require("../middleware/batching");
+const prefs = require("../middleware/prefs");
+const { Prefs } = require("./prefs");
+const rootReducer = require("../reducers/index");
+const { FilterTypes, Filters } = require("../reducers/filters");
+const { Requests } = require("../reducers/requests");
+const { Sort } = require("../reducers/sort");
+const { TimingMarkers } = require("../reducers/timing-markers");
+const { UI } = require("../reducers/ui");
+
+function configureStore() {
+ let activeFilters = {};
+ Prefs.filters.forEach((filter) => {
+ activeFilters[filter] = true;
+ });
+ const initialState = {
+ filters: new Filters({
+ requestFilterTypes: new FilterTypes(activeFilters)
+ }),
+ requests: new Requests(),
+ sort: new Sort(),
+ timingMarkers: new TimingMarkers(),
+ ui: new UI()
+ };
+
+ return createStore(
+ rootReducer,
+ initialState,
+ applyMiddleware(
+ thunk,
+ prefs,
+ batching
+ )
+ );
+}
+
+exports.configureStore = configureStore;
--- a/devtools/client/netmonitor/utils/moz.build
+++ b/devtools/client/netmonitor/utils/moz.build
@@ -1,15 +1,16 @@
# vim: set filetype=python:
# 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/.
DevToolsModules(
'client.js',
+ 'create-store.js',
'filter-predicates.js',
'format-utils.js',
'l10n.js',
'mdn-utils.js',
'prefs.js',
'request-utils.js',
'sort-predicates.js',
)