这是indexloc提供的服务，不要输入任何密码
Skip to content

Fixed typos and grammar #2935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2019
Merged

Fixed typos and grammar #2935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c13cb11
chore: fixed typos and grammar
KirankumarAmbati Sep 24, 2019
e129599
Merge branch 'master' into master
rikinsk Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions console/src/components/App/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,9 @@ class App extends Component {
);
}

if (telemetry.console_opts) {
if (!telemetry.console_opts.telemetryNotificationShown) {
dispatch(showTelemetryNotification());
dispatch(telemetryNotificationShown());
}
if (telemetry.console_opts && !telemetry.console_opts.telemetryNotificationShown) {
dispatch(showTelemetryNotification());
dispatch(telemetryNotificationShown());
}

return (
Expand Down
7 changes: 4 additions & 3 deletions console/src/components/Common/Button/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import React from 'react';
import styles from '../Common.scss';

/*
This is a Button HOC that takes al the props supported by <button> and also
- color: (default: white) color of the button; currently supports yellow, red, green, gray, white
This is a Button HOC that takes all the props supported by <button>
- color(default: white): color of the button; currently supports yellow, red, green, gray and white
- size: size of the button; currently supports xs (extra small), sm(small)
- className: although you can provide any CSS classname, it is recommended to use only the positioning related classes and not the ones that change the appearance (color, font, size) of the button
- className: although you can provide any CSS classname, it is recommended to use only the positioning related classes
and not the ones that change the appearance (color, font, size) of the button
*/

const Button = props => {
Expand Down
4 changes: 2 additions & 2 deletions console/src/components/Common/QueryBuilderJson/QueryBuilderJson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class QueryBuilderJson extends React.Component {
};

const isCustomJsonObject = object => {
// check if is array
// check if it is an array
if (object instanceof Array) {
// if empty array
if (object.length === 0) {
Expand Down Expand Up @@ -68,7 +68,7 @@ class QueryBuilderJson extends React.Component {
return true;
}

// check if is object and not a React element
// check if it is an object and not a React element
return object instanceof Object && !React.isValidElement(object);
};

Expand Down