r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

remove toasts for autosave

This commit is contained in:
catarak 2016-09-07 22:20:42 -04:00
parent 380b960328
commit 861a8f8759
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/modules/IDE/actions/project.js
View File

@ -47,7 +47,7 @@ export function setProjectName(name) {
}; };
} }
export function saveProject() { export function saveProject(autosave) {
return (dispatch, getState) => { return (dispatch, getState) => {
const state = getState(); const state = getState();
if (state.user.id && state.project.owner && state.project.owner.id !== state.user.id) { if (state.user.id && state.project.owner && state.project.owner.id !== state.user.id) {
@ -61,8 +61,10 @@ export function saveProject() {
dispatch({ dispatch({
type: ActionTypes.PROJECT_SAVE_SUCCESS type: ActionTypes.PROJECT_SAVE_SUCCESS
}); });
dispatch(showToast()); if (!autosave) {
dispatch(setToastText('Project saved.')); dispatch(showToast());
dispatch(setToastText('Project saved.'));
}
}) })
.catch((response) => dispatch({ .catch((response) => dispatch({
type: ActionTypes.PROJECT_SAVE_FAIL, type: ActionTypes.PROJECT_SAVE_FAIL,
@ -79,10 +81,8 @@ export function saveProject() {
owner: response.data.user, owner: response.data.user,
files: response.data.files files: response.data.files
}); });
dispatch(showToast()); if (!autosave) {
if (state.preferences.autosave) { dispatch(showToast());
dispatch(setToastText('Autosave enabled.'));
} else {
dispatch(setToastText('Project saved.')); dispatch(setToastText('Project saved.'));
} }
}) })
@ -94,6 +94,11 @@ export function saveProject() {
}; };
} }
export function autosaveProject() {
return (dispatch, getState) => {
saveProject(true)(dispatch, getState);
};
}
export function createProject() { export function createProject() {
return (dispatch) => { return (dispatch) => {

7
client/modules/IDE/pages/IDEView.js
View File

@ -45,7 +45,7 @@ class IDEView extends React.Component {
if (this.props.preferences.autosave if (this.props.preferences.autosave
&& this.props.project.owner && this.props.project.owner
&& this.props.project.owner.id === this.props.user.id) { && this.props.project.owner.id === this.props.user.id) {
this.autosaveInterval = setInterval(this.props.saveProject, 30000); this.autosaveInterval = setInterval(this.props.autosaveProject, 30000);
} }
} }
@ -79,7 +79,7 @@ class IDEView extends React.Component {
if (!this.autosaveInterval && if (!this.autosaveInterval &&
((this.props.preferences.autosave && !prevProps.preferences.autosave) || ((this.props.preferences.autosave && !prevProps.preferences.autosave) ||
(this.props.project.id && !prevProps.project.id))) { (this.props.project.id && !prevProps.project.id))) {
this.autosaveInterval = setInterval(this.props.saveProject, 30000); this.autosaveInterval = setInterval(this.props.autosaveProject, 30000);
// if user turns off autosave preference // if user turns off autosave preference
} else if (this.autosaveInterval && !this.props.preferences.autosave && prevProps.preferences.autosave) { } else if (this.autosaveInterval && !this.props.preferences.autosave && prevProps.preferences.autosave) {
clearInterval(this.autosaveInterval); clearInterval(this.autosaveInterval);
@ -454,6 +454,9 @@ IDEView.propTypes = {
toast: PropTypes.shape({ toast: PropTypes.shape({
isVisible: PropTypes.bool.isRequired isVisible: PropTypes.bool.isRequired
}).isRequired, }).isRequired,
showToast: PropTypes.func.isRequired,
setToastText: PropTypes.func.isRequired,
autosaveProject: PropTypes.func.isRequired
}; };
function mapStateToProps(state) { function mapStateToProps(state) {