- { do {
- if (this.props.loading) {
-
+ { this.props.loading
+ ? (
{ _("optionsBridgeLoading") }
- } else {
- const infoClasses = `bridge__info ${this.props.info
- ? "bridge__info--found"
- : "bridge__info--not-found"}`;
+ : this.renderStatus() }
- const [ statusIcon, statusTitle, statusText ] = do {
- if (!this.props.info) {
- [ "assets/icons8-cancel-120.png"
- , _("optionsBridgeNotFoundStatusTitle")
- , _("optionsBridgeNotFoundStatusText") ]
- } else {
- if (this.props.info.isVersionCompatible) {
- [ "assets/icons8-ok-120.png"
- , _("optionsBridgeFoundStatusTitle") ]
- } else {
- [ "assets/icons8-warn-120.png"
- , _("optionsBridgeIssueStatusTitle") ]
- }
- }
- };
-
-
-
-
-
-
- { statusTitle }
-
-
- { do {
- if (statusText) {
-
- { statusText }
-
- }
- }}
-
-
- { do {
- if (this.props.info) {
-
- }
- }}
-
- }
- }}
-
- { do {
- if (!this.props.loading) {
-
- { do {
- if (this.state.isUpdateAvailable) {
-
-
- { _("optionsBridgeUpdateAvailable") }
-
-
- { do {
- if (this.props.platform === "linux") {
-
- }
- }}
-
-
+ { !this.props.loading &&
+
+ { this.state.isUpdateAvailable
+ ? (
+
+
+ { _("optionsBridgeUpdateAvailable") }
+
+
+ { this.props.platform === "linux" &&
+ }
+
- } else {
-
+ ) : (
+
- }
- }}
+ { this.state.isCheckingUpdates
+ ? _("optionsBridgeUpdateChecking"
+ , getNextEllipsis(this.state.checkUpdatesEllipsis))
+ : _("optionsBridgeUpdateCheck") }
+
+ )}
-
- { do {
- if (this.state.updateStatus
- && !this.state.isUpdateAvailable) {
- this.state.updateStatus;
- }
- }}
-
+
+ { this.state.updateStatus && !this.state.isUpdateAvailable
+ && this.state.updateStatus }
- }
- }}
+
}
);
}
diff --git a/ext/src/options/EditableList.jsx b/ext/src/options/EditableList.jsx
index 80d260e..a1b33cb 100644
--- a/ext/src/options/EditableList.jsx
+++ b/ext/src/options/EditableList.jsx
@@ -56,14 +56,13 @@ export default class EditableList extends Component {
return {
rawView: true
- , rawViewValue: [...currentState.items.values()].join("\n")
+ , rawViewValue: Array.from(currentState.items.values()).join("\n")
};
});
}
handleSaveRaw () {
this.setState(currentState => {
- console.log(currentState.rawViewValue);
const newItems = currentState.rawViewValue.split("\n")
.filter(item => item !== "");
@@ -137,15 +136,15 @@ export default class EditableList extends Component {
- { do {
- if (this.state.rawView) {
+ { this.state.rawView
+ ? (
- } else {
+ ) : (
- }
- }}
+ )}