mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 23:35:34 +00:00
Bug 1620967 - Rename EvaluationSelector to EvaluationContextSelector. r=jlast.
Differential Revision: https://phabricator.services.mozilla.com/D65965 --HG-- rename : devtools/client/webconsole/components/Input/EvaluationSelector.css => devtools/client/webconsole/components/Input/EvaluationContextSelector.css rename : devtools/client/webconsole/components/Input/EvaluationSelector.js => devtools/client/webconsole/components/Input/EvaluationContextSelector.js extra : moz-landing-system : lando
This commit is contained in:
parent
5836242575
commit
3f2cbeac4f
@ -115,7 +115,7 @@ class App extends Component {
|
||||
filterBarDisplayMode: PropTypes.oneOf([
|
||||
...Object.values(FILTERBAR_DISPLAY_MODES),
|
||||
]).isRequired,
|
||||
showEvaluationSelector: PropTypes.bool,
|
||||
showEvaluationContextSelector: PropTypes.bool,
|
||||
};
|
||||
}
|
||||
|
||||
@ -293,7 +293,7 @@ class App extends Component {
|
||||
reverseSearchInputVisible,
|
||||
serviceContainer,
|
||||
webConsoleUI,
|
||||
showEvaluationSelector,
|
||||
showEvaluationContextSelector,
|
||||
} = this.props;
|
||||
|
||||
return editorMode
|
||||
@ -303,7 +303,7 @@ class App extends Component {
|
||||
dispatch,
|
||||
reverseSearchInputVisible,
|
||||
serviceContainer,
|
||||
showEvaluationSelector,
|
||||
showEvaluationContextSelector,
|
||||
webConsoleUI,
|
||||
})
|
||||
: null;
|
||||
@ -473,7 +473,7 @@ const mapStateToProps = state => ({
|
||||
filterBarDisplayMode: state.ui.filterBarDisplayMode,
|
||||
eagerEvaluationEnabled: state.prefs.eagerEvaluation,
|
||||
autocomplete: state.prefs.autocomplete,
|
||||
showEvaluationSelector: state.ui.showEvaluationSelector,
|
||||
showEvaluationContextSelector: state.ui.showEvaluationContextSelector,
|
||||
});
|
||||
|
||||
const mapDispatchToProps = dispatch => ({
|
||||
|
@ -12,8 +12,8 @@ const {
|
||||
const dom = require("devtools/client/shared/vendor/react-dom-factories");
|
||||
const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
|
||||
|
||||
const EvaluationSelector = createFactory(
|
||||
require("devtools/client/webconsole/components/Input/EvaluationSelector")
|
||||
const EvaluationContextSelector = createFactory(
|
||||
require("devtools/client/webconsole/components/Input/EvaluationContextSelector")
|
||||
);
|
||||
|
||||
const actions = require("devtools/client/webconsole/actions/index");
|
||||
@ -35,7 +35,7 @@ class EditorToolbar extends Component {
|
||||
reverseSearchInputVisible: PropTypes.bool.isRequired,
|
||||
serviceContainer: PropTypes.object.isRequired,
|
||||
webConsoleUI: PropTypes.object.isRequired,
|
||||
showEvaluationSelector: PropTypes.bool,
|
||||
showEvaluationContextSelector: PropTypes.bool,
|
||||
};
|
||||
}
|
||||
|
||||
@ -58,15 +58,15 @@ class EditorToolbar extends Component {
|
||||
);
|
||||
}
|
||||
|
||||
renderEvaluationSelector() {
|
||||
renderEvaluationContextSelector() {
|
||||
if (
|
||||
!this.props.webConsoleUI.wrapper.toolbox ||
|
||||
!this.props.showEvaluationSelector
|
||||
!this.props.showEvaluationContextSelector
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return EvaluationSelector({
|
||||
return EvaluationContextSelector({
|
||||
webConsoleUI: this.props.webConsoleUI,
|
||||
});
|
||||
}
|
||||
@ -101,7 +101,7 @@ class EditorToolbar extends Component {
|
||||
},
|
||||
l10n.getStr("webconsole.editor.toolbar.executeButton.label")
|
||||
),
|
||||
this.renderEvaluationSelector(),
|
||||
this.renderEvaluationContextSelector(),
|
||||
dom.button({
|
||||
className:
|
||||
"devtools-button webconsole-editor-toolbar-history-prevExpressionButton",
|
||||
|
@ -36,7 +36,7 @@ loader.lazyGetter(this, "MenuList", function() {
|
||||
);
|
||||
});
|
||||
|
||||
class EvaluationSelector extends Component {
|
||||
class EvaluationContextSelector extends Component {
|
||||
static get propTypes() {
|
||||
return {
|
||||
selectThread: PropTypes.func.isRequired,
|
||||
@ -155,7 +155,7 @@ const toolboxConnected = connect(
|
||||
}),
|
||||
undefined,
|
||||
{ storeKey: "toolbox-store" }
|
||||
)(EvaluationSelector);
|
||||
)(EvaluationContextSelector);
|
||||
|
||||
module.exports = connect(
|
||||
state => state,
|
@ -64,8 +64,8 @@ const {
|
||||
} = require("devtools/client/webconsole/selectors/autocomplete");
|
||||
const actions = require("devtools/client/webconsole/actions/index");
|
||||
|
||||
const EvaluationSelector = createFactory(
|
||||
require("devtools/client/webconsole/components/Input/EvaluationSelector")
|
||||
const EvaluationContextSelector = createFactory(
|
||||
require("devtools/client/webconsole/components/Input/EvaluationContextSelector")
|
||||
);
|
||||
|
||||
// Constants used for defining the direction of JSTerm input history navigation.
|
||||
@ -115,7 +115,7 @@ class JSTerm extends Component {
|
||||
editorWidth: PropTypes.number,
|
||||
showEditorOnboarding: PropTypes.bool,
|
||||
autocomplete: PropTypes.bool,
|
||||
showEvaluationSelector: PropTypes.bool,
|
||||
showEvaluationContextSelector: PropTypes.bool,
|
||||
autocompletePopupPosition: PropTypes.string,
|
||||
};
|
||||
}
|
||||
@ -1308,16 +1308,16 @@ class JSTerm extends Component {
|
||||
});
|
||||
}
|
||||
|
||||
renderEvaluationSelector() {
|
||||
renderEvaluationContextSelector() {
|
||||
if (
|
||||
!this.props.webConsoleUI.wrapper.toolbox ||
|
||||
this.props.editorMode ||
|
||||
!this.props.showEvaluationSelector
|
||||
!this.props.showEvaluationContextSelector
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return EvaluationSelector(this.props);
|
||||
return EvaluationContextSelector(this.props);
|
||||
}
|
||||
|
||||
renderEditorOnboarding() {
|
||||
@ -1380,7 +1380,7 @@ class JSTerm extends Component {
|
||||
},
|
||||
dom.div(
|
||||
{ className: "webconsole-input-buttons" },
|
||||
this.renderEvaluationSelector(),
|
||||
this.renderEvaluationContextSelector(),
|
||||
this.renderOpenEditorButton()
|
||||
),
|
||||
this.renderEditorOnboarding()
|
||||
@ -1396,7 +1396,7 @@ function mapStateToProps(state) {
|
||||
getValueFromHistory: direction => getHistoryValue(state, direction),
|
||||
autocompleteData: getAutocompleteState(state),
|
||||
showEditorOnboarding: state.ui.showEditorOnboarding,
|
||||
showEvaluationSelector: state.ui.showEvaluationSelector,
|
||||
showEvaluationContextSelector: state.ui.showEvaluationContextSelector,
|
||||
autocompletePopupPosition: state.prefs.eagerEvaluation ? "top" : "bottom",
|
||||
};
|
||||
}
|
||||
|
@ -8,8 +8,8 @@ DevToolsModules(
|
||||
'EagerEvaluation.css',
|
||||
'EagerEvaluation.js',
|
||||
'EditorToolbar.js',
|
||||
'EvaluationSelector.css',
|
||||
'EvaluationSelector.js',
|
||||
'EvaluationContextSelector.css',
|
||||
'EvaluationContextSelector.js',
|
||||
'JSTerm.js',
|
||||
'ReverseSearchInput.css',
|
||||
'ReverseSearchInput.js',
|
||||
|
@ -21,7 +21,7 @@
|
||||
<link rel="stylesheet" href="resource://devtools/client/shared/components/splitter/GridElementResizer.css"/>
|
||||
<link rel="stylesheet" href="chrome://devtools/content/netmonitor/src/assets/styles/httpi.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EagerEvaluation.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EvaluationSelector.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EvaluationContextSelector.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/ReverseSearchInput.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/webconsole/components/App.css"/>
|
||||
<link rel="stylesheet" href="resource://devtools/client/shared/components/Accordion.css"/>
|
||||
|
@ -83,7 +83,7 @@ function configureStore(webConsoleUI, options = {}) {
|
||||
editorWidth: getIntPref(PREFS.UI.EDITOR_WIDTH),
|
||||
showEditorOnboarding: getBoolPref(PREFS.UI.EDITOR_ONBOARDING),
|
||||
timestampsVisible: getBoolPref(PREFS.UI.MESSAGE_TIMESTAMP),
|
||||
showEvaluationSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
|
||||
showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
|
||||
}),
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user