☠☠ backed out by 77b0ddb1fd71 ☠ ☠ | |
author | Gabriel Luong <gabriel.luong@gmail.com> |
Wed, 15 Feb 2017 10:28:21 +0100 | |
changeset 344649 | c0df0213c72b4ca4ee20acb82a2073bad938f6e0 |
parent 344648 | e7d3c4bfc72968d65fd5cb69edc2351a5efa82f0 |
child 344650 | a7e1c96ccf8705e199afb9156d88b4339e594612 |
push id | 31414 |
push user | cbook@mozilla.com |
push date | Fri, 24 Feb 2017 10:47:41 +0000 |
treeherder | mozilla-central@be661bae6cb9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jdescottes |
bugs | 1336198 |
milestone | 54.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
rename from devtools/client/inspector/layout/actions/box-model.js rename to devtools/client/inspector/boxmodel/actions/box-model.js
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/actions/index.js @@ -0,0 +1,14 @@ +/* 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);
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/actions/moz.build @@ -0,0 +1,10 @@ +# -*- 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', +)
rename from devtools/client/inspector/layout/components/BoxModel.js rename to devtools/client/inspector/boxmodel/components/BoxModel.js
rename from devtools/client/inspector/layout/components/BoxModelEditable.js rename to devtools/client/inspector/boxmodel/components/BoxModelEditable.js
rename from devtools/client/inspector/layout/components/BoxModelInfo.js rename to devtools/client/inspector/boxmodel/components/BoxModelInfo.js
rename from devtools/client/inspector/layout/components/BoxModelMain.js rename to devtools/client/inspector/boxmodel/components/BoxModelMain.js
rename from devtools/client/inspector/layout/components/BoxModelProperties.js rename to devtools/client/inspector/boxmodel/components/BoxModelProperties.js
rename from devtools/client/inspector/layout/components/ComputedProperty.js rename to devtools/client/inspector/boxmodel/components/ComputedProperty.js
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/components/moz.build @@ -0,0 +1,14 @@ +# -*- 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', +)
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/moz.build @@ -0,0 +1,16 @@ +# -*- 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', +)
rename from devtools/client/inspector/layout/reducers/box-model.js rename to devtools/client/inspector/boxmodel/reducers/box-model.js
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/reducers/moz.build @@ -0,0 +1,9 @@ +# -*- 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', +)
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/types.js @@ -0,0 +1,17 @@ +/* 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, + +};
rename from devtools/client/inspector/layout/utils/editing-session.js rename to devtools/client/inspector/boxmodel/utils/editing-session.js
new file mode 100644 --- /dev/null +++ b/devtools/client/inspector/boxmodel/utils/moz.build @@ -0,0 +1,9 @@ +# -*- 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', +)
--- a/devtools/client/inspector/layout/actions/index.js +++ b/devtools/client/inspector/layout/actions/index.js @@ -12,18 +12,15 @@ createEnum([ "UPDATE_GRID_COLOR", // Update the grid highlighted state. "UPDATE_GRID_HIGHLIGHTED", // 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", // Update the grid highlighter's show infinite lines state. "UPDATE_SHOW_INFINITE_LINES", ], module.exports);
--- a/devtools/client/inspector/layout/actions/moz.build +++ b/devtools/client/inspector/layout/actions/moz.build @@ -1,12 +1,11 @@ # -*- 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', 'grids.js', 'highlighter-settings.js', 'index.js', )
--- a/devtools/client/inspector/layout/components/moz.build +++ b/devtools/client/inspector/layout/components/moz.build @@ -3,19 +3,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/. DevToolsModules( 'Accordion.css', 'Accordion.js', 'App.js', - 'BoxModel.js', - 'BoxModelEditable.js', - 'BoxModelInfo.js', - 'BoxModelMain.js', - 'BoxModelProperties.js', - 'ComputedProperty.js', 'Grid.js', 'GridDisplaySettings.js', 'GridItem.js', 'GridList.js', )
--- a/devtools/client/inspector/layout/reducers/moz.build +++ b/devtools/client/inspector/layout/reducers/moz.build @@ -1,11 +1,10 @@ # -*- 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', 'grids.js', 'highlighter-settings.js', )
--- a/devtools/client/inspector/layout/types.js +++ b/devtools/client/inspector/layout/types.js @@ -2,26 +2,16 @@ * 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, - -}; - -/** * A single grid container in the document. */ exports.grid = { // The id of the grid id: PropTypes.number, // The color for the grid overlay highlighter
--- a/devtools/client/inspector/layout/utils/moz.build +++ b/devtools/client/inspector/layout/utils/moz.build @@ -1,10 +1,9 @@ # -*- 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', 'l10n.js', )
--- a/devtools/client/inspector/moz.build +++ b/devtools/client/inspector/moz.build @@ -1,13 +1,14 @@ # 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 += [ + 'boxmodel', 'components', 'computed', 'fonts', 'layout', 'markup', 'rules', 'shared' ]
--- a/devtools/client/inspector/reducers.js +++ b/devtools/client/inspector/reducers.js @@ -2,11 +2,11 @@ * 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"; // This file exposes the Redux reducers of the box model, grid and grid highlighter // settings. -exports.boxModel = require("devtools/client/inspector/layout/reducers/box-model"); +exports.boxModel = require("devtools/client/inspector/boxmodel/reducers/box-model"); exports.grids = require("devtools/client/inspector/layout/reducers/grids"); exports.highlighterSettings = require("devtools/client/inspector/layout/reducers/highlighter-settings");