aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaúl Ibarra Corretgé <s@saghul.net>2018-06-21 07:53:18 +0200
committerSaúl Ibarra Corretgé <s@saghul.net>2018-06-21 07:55:32 +0200
commitf1846bd4cb20257c3c556dbe8250490b86c29c8a (patch)
treee5bafb27dcf7e593e24f41b90cbe4dfb27fe4d13
parentbe44cb9496e515acadbc6817eb6d8a2c04e1b03e (diff)
Rename XyzAction components to XyzButton
The term "action" is quite overloaded since we use redux, so let's call it "button" since that's how it behaves.
-rw-r--r--app/features/navbar/components/HelpButton.js (renamed from app/features/navbar/components/HelpAction.js)6
-rw-r--r--app/features/navbar/components/Navbar.js8
-rw-r--r--app/features/settings/components/SettingsButton.js (renamed from app/features/settings/components/SettingsAction.js)10
-rw-r--r--app/features/settings/components/index.js2
4 files changed, 12 insertions, 14 deletions
diff --git a/app/features/navbar/components/HelpAction.js b/app/features/navbar/components/HelpButton.js
index b421e7c..f296b4f 100644
--- a/app/features/navbar/components/HelpAction.js
+++ b/app/features/navbar/components/HelpButton.js
@@ -17,9 +17,9 @@ type State = {
};
/**
- * Help Action for Navigation Bar.
+ * Help button for Navigation Bar.
*/
-class HelpAction extends Component< *, State> {
+export default class HelpButton extends Component< *, State> {
/**
* Initializes a new {@code HelpAction} instance.
*
@@ -104,5 +104,3 @@ class HelpAction extends Component< *, State> {
);
}
}
-
-export default HelpAction;
diff --git a/app/features/navbar/components/Navbar.js b/app/features/navbar/components/Navbar.js
index 3d8c911..140dfb6 100644
--- a/app/features/navbar/components/Navbar.js
+++ b/app/features/navbar/components/Navbar.js
@@ -6,10 +6,10 @@ import Navigation, { AkGlobalItem } from '@atlaskit/navigation';
import React, { Component } from 'react';
import { connect } from 'react-redux';
-import { SettingsAction, SettingsDrawer } from '../../settings';
+import { SettingsButton, SettingsDrawer } from '../../settings';
import { isElectronMac } from '../../utils';
-import HelpAction from './HelpAction';
+import HelpButton from './HelpButton';
import Logo from './Logo';
/**
@@ -24,7 +24,7 @@ class Navbar extends Component<*> {
_getPrimaryActions() {
return [
<AkGlobalItem key = { 0 }>
- <SettingsAction />
+ <SettingsButton />
</AkGlobalItem>
];
}
@@ -37,7 +37,7 @@ class Navbar extends Component<*> {
_getSecondaryActions() {
return [
<AkGlobalItem key = { 0 }>
- <HelpAction />
+ <HelpButton />
</AkGlobalItem>
];
}
diff --git a/app/features/settings/components/SettingsAction.js b/app/features/settings/components/SettingsButton.js
index 080e3c6..6d030cc 100644
--- a/app/features/settings/components/SettingsAction.js
+++ b/app/features/settings/components/SettingsButton.js
@@ -19,11 +19,11 @@ type Props = {
};
/**
- * Setttings Action for Navigation Bar.
+ * Setttings button for Navigation Bar.
*/
-class SettingsAction extends Component<Props, *> {
+class SettingButton extends Component<Props, *> {
/**
- * Initializes a new {@code SettingsAction} instance.
+ * Initializes a new {@code SettingButton} instance.
*
* @inheritdoc
*/
@@ -48,7 +48,7 @@ class SettingsAction extends Component<Props, *> {
_onIconClick: (*) => void;
/**
- * Open Settings drawer when SettingsAction is clicked.
+ * Open Settings drawer when SettingButton is clicked.
*
* @returns {void}
*/
@@ -57,4 +57,4 @@ class SettingsAction extends Component<Props, *> {
}
}
-export default connect()(SettingsAction);
+export default connect()(SettingButton);
diff --git a/app/features/settings/components/index.js b/app/features/settings/components/index.js
index 63dd49d..82302fe 100644
--- a/app/features/settings/components/index.js
+++ b/app/features/settings/components/index.js
@@ -1,2 +1,2 @@
-export { default as SettingsAction } from './SettingsAction';
+export { default as SettingsButton } from './SettingsButton';
export { default as SettingsDrawer } from './SettingsDrawer';