Backed out changeset 2644c783041d (bug 1336198)

--HG--
rename : devtools/client/inspector/boxmodel/actions/box-model.js => devtools/client/inspector/layout/actions/box-model.js
rename : devtools/client/inspector/boxmodel/components/BoxModel.js => devtools/client/inspector/layout/components/BoxModel.js
rename : devtools/client/inspector/boxmodel/components/BoxModelEditable.js => devtools/client/inspector/layout/components/BoxModelEditable.js
rename : devtools/client/inspector/boxmodel/components/BoxModelInfo.js => devtools/client/inspector/layout/components/BoxModelInfo.js
rename : devtools/client/inspector/boxmodel/components/BoxModelMain.js => devtools/client/inspector/layout/components/BoxModelMain.js
rename : devtools/client/inspector/boxmodel/components/BoxModelProperties.js => devtools/client/inspector/layout/components/BoxModelProperties.js
rename : devtools/client/inspector/boxmodel/components/ComputedProperty.js => devtools/client/inspector/layout/components/ComputedProperty.js
rename : devtools/client/inspector/boxmodel/reducers/box-model.js => devtools/client/inspector/layout/reducers/box-model.js
rename : devtools/client/inspector/boxmodel/utils/editing-session.js => devtools/client/inspector/layout/utils/editing-session.js

devtools/client/inspector/boxmodel/actions/index.js

@@ -1,14 +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 { createEnum } = require("devtools/client/shared/enum");
-
-createEnum([
-
-  // Update the layout state with the latest layout properties.
-  "UPDATE_LAYOUT",
-
-], module.exports);

devtools/client/inspector/boxmodel/actions/moz.build

@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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(
-    'box-model.js',
-    'index.js',
-)

devtools/client/inspector/boxmodel/components/moz.build

@@ -1,14 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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(
-    'BoxModel.js',
-    'BoxModelEditable.js',
-    'BoxModelInfo.js',
-    'BoxModelMain.js',
-    'BoxModelProperties.js',
-    'ComputedProperty.js',
-)

devtools/client/inspector/boxmodel/moz.build

@@ -1,16 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-DIRS += [
-    'actions',
-    'components',
-    'reducers',
-    'utils',
-]
-
-DevToolsModules(
-    'types.js',
-)

devtools/client/inspector/boxmodel/reducers/moz.build

@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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(
-    'box-model.js',
-)

devtools/client/inspector/boxmodel/types.js

@@ -1,17 +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 { PropTypes } = require("devtools/client/shared/vendor/react");
-
-/**
- * The box model data for the current selected node.
- */
-exports.boxModel = {
-
-  // The layout information of the current selected node
-  layout: PropTypes.object,
-
-};

devtools/client/inspector/boxmodel/utils/moz.build

@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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(
-    'editing-session.js',
-)

devtools/client/inspector/layout/actions/index.js

@@ -14,6 +14,9 @@ createEnum([
   // Update the entire grids state with the new list of grids.
   "UPDATE_GRIDS",
 
+  // Update the layout state with the latest layout properties.
+  "UPDATE_LAYOUT",
+
   // Update the grid highlighter's show grid line numbers state.
   "UPDATE_SHOW_GRID_LINE_NUMBERS",
 

devtools/client/inspector/layout/actions/moz.build

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'box-model.js',
     'grids.js',
     'highlighter-settings.js',
     'index.js',

devtools/client/inspector/layout/components/moz.build

@@ -8,6 +8,12 @@ DevToolsModules(
     'Accordion.css',
     'Accordion.js',
     'App.js',
+    'BoxModel.js',
+    'BoxModelEditable.js',
+    'BoxModelInfo.js',
+    'BoxModelMain.js',
+    'BoxModelProperties.js',
+    'ComputedProperty.js',
     'Grid.js',
     'GridDisplaySettings.js',
     'GridList.js',

devtools/client/inspector/layout/reducers/moz.build

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'box-model.js',
     'grids.js',
     'highlighter-settings.js',
 )

devtools/client/inspector/layout/types.js

@@ -6,6 +6,16 @@
 
 const { PropTypes } = require("devtools/client/shared/vendor/react");
 
+/**
+ * The box model data for the current selected node.
+ */
+exports.boxModel = {
+
+  // The layout information of the current selected node
+  layout: PropTypes.object,
+
+};
+
 /**
  * A single grid container in the document.
  */

devtools/client/inspector/layout/utils/moz.build

@@ -5,5 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'editing-session.js',
     'l10n.js',
 )

devtools/client/inspector/moz.build

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'boxmodel',
     'components',
     'computed',
     'fonts',

devtools/client/inspector/reducers.js

@@ -7,6 +7,6 @@
 // This file exposes the Redux reducers of the box model, grid and grid highlighter
 // settings.
 
-exports.boxModel = require("devtools/client/inspector/boxmodel/reducers/box-model");
+exports.boxModel = require("devtools/client/inspector/layout/reducers/box-model");
 exports.grids = require("devtools/client/inspector/layout/reducers/grids");
 exports.highlighterSettings = require("devtools/client/inspector/layout/reducers/highlighter-settings");