Skip to content
Snippets Groups Projects
Commit 2b28d0fb authored by chrisgarrity's avatar chrisgarrity
Browse files

move default project name handling fully into gui

parent b8aa33ac
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,6 @@ import PropTypes from 'prop-types'; ...@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
import bindAll from 'lodash.bindall'; import bindAll from 'lodash.bindall';
import React from 'react'; import React from 'react';
import {defineMessages, intlShape, injectIntl} from 'react-intl'; import {defineMessages, intlShape, injectIntl} from 'react-intl';
import sharedMessages from '../../lib/shared-messages';
import BufferedInputHOC from '../forms/buffered-input-hoc.jsx'; import BufferedInputHOC from '../forms/buffered-input-hoc.jsx';
import Input from '../forms/input.jsx'; import Input from '../forms/input.jsx';
...@@ -42,10 +41,7 @@ class ProjectTitleInput extends React.Component { ...@@ -42,10 +41,7 @@ class ProjectTitleInput extends React.Component {
placeholder={this.props.intl.formatMessage(messages.projectTitlePlaceholder)} placeholder={this.props.intl.formatMessage(messages.projectTitlePlaceholder)}
tabIndex="0" tabIndex="0"
type="text" type="text"
value={this.props.projectTitle ? value={this.props.projectTitle}
this.props.projectTitle :
this.props.intl.formatMessage(sharedMessages.defaultProjectTitle)
}
onSubmit={this.handleUpdateProjectTitle} onSubmit={this.handleUpdateProjectTitle}
/> />
); );
......
...@@ -4,7 +4,7 @@ import {compose} from 'redux'; ...@@ -4,7 +4,7 @@ import {compose} from 'redux';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import ReactModal from 'react-modal'; import ReactModal from 'react-modal';
import VM from 'scratch-vm'; import VM from 'scratch-vm';
import {injectIntl, intlShape} from 'react-intl'; import {defineMessages, injectIntl, intlShape} from 'react-intl';
import ErrorBoundaryHOC from '../lib/error-boundary-hoc.jsx'; import ErrorBoundaryHOC from '../lib/error-boundary-hoc.jsx';
import {openExtensionLibrary} from '../reducers/modals'; import {openExtensionLibrary} from '../reducers/modals';
...@@ -30,10 +30,17 @@ import ProjectFetcherHOC from '../lib/project-fetcher-hoc.jsx'; ...@@ -30,10 +30,17 @@ import ProjectFetcherHOC from '../lib/project-fetcher-hoc.jsx';
import ProjectSaverHOC from '../lib/project-saver-hoc.jsx'; import ProjectSaverHOC from '../lib/project-saver-hoc.jsx';
import vmListenerHOC from '../lib/vm-listener-hoc.jsx'; import vmListenerHOC from '../lib/vm-listener-hoc.jsx';
import vmManagerHOC from '../lib/vm-manager-hoc.jsx'; import vmManagerHOC from '../lib/vm-manager-hoc.jsx';
import sharedMessages from '../lib/shared-messages';
import GUIComponent from '../components/gui/gui.jsx'; import GUIComponent from '../components/gui/gui.jsx';
const messages = defineMessages({
defaultProjectTitle: {
id: 'gui.gui.defaultProjectTitle',
description: 'Default title for project',
defaultMessage: 'Scratch Project'
}
});
class GUI extends React.Component { class GUI extends React.Component {
componentDidMount () { componentDidMount () {
this.setReduxTitle(this.props.projectTitle); this.setReduxTitle(this.props.projectTitle);
...@@ -49,7 +56,7 @@ class GUI extends React.Component { ...@@ -49,7 +56,7 @@ class GUI extends React.Component {
setReduxTitle (newTitle) { setReduxTitle (newTitle) {
if (newTitle === null || typeof newTitle === 'undefined') { if (newTitle === null || typeof newTitle === 'undefined') {
this.props.onUpdateReduxProjectTitle( this.props.onUpdateReduxProjectTitle(
this.props.intl.formatMessage(sharedMessages.defaultProjectTitle) this.props.intl.formatMessage(messages.defaultProjectTitle)
); );
} else { } else {
this.props.onUpdateReduxProjectTitle(newTitle); this.props.onUpdateReduxProjectTitle(newTitle);
......
...@@ -20,10 +20,5 @@ export default defineMessages({ ...@@ -20,10 +20,5 @@ export default defineMessages({
defaultMessage: 'pop', defaultMessage: 'pop',
description: 'Name of the pop sound, the default sound added to a sprite', description: 'Name of the pop sound, the default sound added to a sprite',
id: 'gui.sharedMessages.pop' id: 'gui.sharedMessages.pop'
},
defaultProjectTitle: {
id: 'gui.gui.defaultProjectTitle',
description: 'Default title for project',
defaultMessage: 'Scratch Project'
} }
}); });
...@@ -13,7 +13,7 @@ const TitledHOC = function (WrappedComponent) { ...@@ -13,7 +13,7 @@ const TitledHOC = function (WrappedComponent) {
'handleUpdateProjectTitle' 'handleUpdateProjectTitle'
]); ]);
this.state = { this.state = {
projectTitle: '' projectTitle: null
}; };
} }
handleUpdateProjectTitle (newTitle) { handleUpdateProjectTitle (newTitle) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment