1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00

Applied prettier to code base

This commit is contained in:
Laurent Cozic
2018-03-09 17:49:35 +00:00
parent e868102c98
commit c4f19465a6
203 changed files with 13395 additions and 7927 deletions

View File

@ -1,25 +1,25 @@
const React = require('react'); const Component = React.Component;
const { StyleSheet, Text } = require('react-native');
const Icon = require('react-native-vector-icons/Ionicons').default;
const ReactNativeActionButton = require('react-native-action-button').default;
const { connect } = require('react-redux');
const { globalStyle } = require('lib/components/global-style.js');
const { Log } = require('lib/log.js');
const { _ } = require('lib/locale.js');
const React = require("react");
const Component = React.Component;
const { StyleSheet, Text } = require("react-native");
const Icon = require("react-native-vector-icons/Ionicons").default;
const ReactNativeActionButton = require("react-native-action-button").default;
const { connect } = require("react-redux");
const { globalStyle } = require("lib/components/global-style.js");
const { Log } = require("lib/log.js");
const { _ } = require("lib/locale.js");
const styles = StyleSheet.create({
actionButtonIcon: {
fontSize: 20,
height: 22,
color: 'white',
color: "white",
},
itemText: {
// fontSize: 14, // Cannot currently set fontsize since the bow surrounding the label has a fixed size
}
},
});
class ActionButtonComponent extends React.Component {
constructor() {
super();
this.state = {
@ -28,35 +28,35 @@ class ActionButtonComponent extends React.Component {
}
componentWillReceiveProps(newProps) {
if ('buttonIndex' in newProps) {
if ("buttonIndex" in newProps) {
this.setState({ buttonIndex: newProps.buttonIndex });
}
}
newTodo_press() {
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Note',
type: "NAV_GO",
routeName: "Note",
noteId: null,
folderId: this.props.parentFolderId,
itemType: 'todo',
itemType: "todo",
});
}
newNote_press() {
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Note',
type: "NAV_GO",
routeName: "Note",
noteId: null,
folderId: this.props.parentFolderId,
itemType: 'note',
itemType: "note",
});
}
newFolder_press() {
this.props.dispatch({
type: 'NAV_GO',
routeName: 'Folder',
type: "NAV_GO",
routeName: "Folder",
folderId: null,
});
}
@ -67,33 +67,39 @@ class ActionButtonComponent extends React.Component {
if (this.props.addFolderNoteButtons) {
if (this.props.folders.length) {
buttons.push({
title: _('New to-do'),
onPress: () => { this.newTodo_press() },
color: '#9b59b6',
icon: 'md-checkbox-outline',
title: _("New to-do"),
onPress: () => {
this.newTodo_press();
},
color: "#9b59b6",
icon: "md-checkbox-outline",
});
buttons.push({
title: _('New note'),
onPress: () => { this.newNote_press() },
color: '#9b59b6',
icon: 'md-document',
title: _("New note"),
onPress: () => {
this.newNote_press();
},
color: "#9b59b6",
icon: "md-document",
});
}
buttons.push({
title: _('New notebook'),
onPress: () => { this.newFolder_press() },
color: '#3498db',
icon: 'md-folder',
title: _("New notebook"),
onPress: () => {
this.newFolder_press();
},
color: "#3498db",
icon: "md-folder",
});
}
let buttonComps = [];
for (let i = 0; i < buttons.length; i++) {
let button = buttons[i];
let buttonTitle = button.title ? button.title : '';
let key = buttonTitle.replace(/\s/g, '_') + '_' + button.icon;
let buttonTitle = button.title ? button.title : "";
let key = buttonTitle.replace(/\s/g, "_") + "_" + button.icon;
buttonComps.push(
<ReactNativeActionButton.Item key={key} buttonColor={button.color} title={buttonTitle} onPress={button.onPress}>
<Icon name={button.icon} style={styles.actionButtonIcon} />
@ -102,41 +108,41 @@ class ActionButtonComponent extends React.Component {
}
if (!buttonComps.length && !this.props.mainButton) {
return <ReactNativeActionButton style={{ display: 'none' }}/>
return <ReactNativeActionButton style={{ display: "none" }} />;
}
let mainButton = this.props.mainButton ? this.props.mainButton : {};
let mainIcon = mainButton.icon ? <Icon name={mainButton.icon} style={styles.actionButtonIcon} /> : <Icon name="md-add" style={styles.actionButtonIcon} />
let mainIcon = mainButton.icon ? <Icon name={mainButton.icon} style={styles.actionButtonIcon} /> : <Icon name="md-add" style={styles.actionButtonIcon} />;
if (this.props.multiStates) {
if (!this.props.buttons || !this.props.buttons.length) throw new Error('Multi-state button requires at least one state');
if (this.state.buttonIndex < 0 || this.state.buttonIndex >= this.props.buttons.length) throw new Error('Button index out of bounds: ' + this.state.buttonIndex + '/' + this.props.buttons.length);
if (!this.props.buttons || !this.props.buttons.length) throw new Error("Multi-state button requires at least one state");
if (this.state.buttonIndex < 0 || this.state.buttonIndex >= this.props.buttons.length) throw new Error("Button index out of bounds: " + this.state.buttonIndex + "/" + this.props.buttons.length);
let button = this.props.buttons[this.state.buttonIndex];
let mainIcon = <Icon name={button.icon} style={styles.actionButtonIcon} />
let mainIcon = <Icon name={button.icon} style={styles.actionButtonIcon} />;
return (
<ReactNativeActionButton
icon={mainIcon}
buttonColor="rgba(231,76,60,1)"
onPress={() => { button.onPress() }}
onPress={() => {
button.onPress();
}}
/>
);
} else {
return (
<ReactNativeActionButton textStyle={styles.itemText} icon={mainIcon} buttonColor="rgba(231,76,60,1)" onPress={ function() { } }>
{ buttonComps }
<ReactNativeActionButton textStyle={styles.itemText} icon={mainIcon} buttonColor="rgba(231,76,60,1)" onPress={function() {}}>
{buttonComps}
</ReactNativeActionButton>
);
}
}
}
const ActionButton = connect(
(state) => {
return {
folders: state.folders,
locale: state.settings.locale,
};
}
)(ActionButtonComponent)
const ActionButton = connect(state => {
return {
folders: state.folders,
locale: state.settings.locale,
};
})(ActionButtonComponent);
module.exports = { ActionButton };
module.exports = { ActionButton };