Merge branch 'develop' into addLine

This commit is contained in:
DD 2017-08-25 12:01:41 -04:00
commit cc50a14e1d
14 changed files with 29 additions and 50 deletions

4
.gitignore vendored
View file

@ -12,3 +12,7 @@ dist/*
# Editors
/#*
*~
# generated translation files
/translations
/locale

View file

@ -1,6 +0,0 @@
{
"en": {
"paint.brushMode.brush": "Brush",
"paint.eraserMode.eraser": "Eraser"
}
}

View file

@ -74,8 +74,8 @@ BrushMode.propTypes = {
};
const mapStateToProps = state => ({
brushModeState: state.brushMode,
isBrushModeActive: state.mode === Modes.BRUSH
brushModeState: state.scratchPaint.brushMode,
isBrushModeActive: state.scratchPaint.mode === Modes.BRUSH
});
const mapDispatchToProps = dispatch => ({
changeBrushSize: brushSize => {

View file

@ -70,8 +70,8 @@ EraserMode.propTypes = {
};
const mapStateToProps = state => ({
eraserModeState: state.eraserMode,
isEraserModeActive: state.mode === Modes.ERASER
eraserModeState: state.scratchPaint.eraserMode,
isEraserModeActive: state.scratchPaint.mode === Modes.ERASER
});
const mapDispatchToProps = dispatch => ({
changeBrushSize: brushSize => {

View file

@ -281,8 +281,8 @@ LineMode.propTypes = {
};
const mapStateToProps = state => ({
lineModeState: state.lineMode,
isLineModeActive: state.mode === Modes.LINE
lineModeState: state.scratchPaint.lineMode,
isLineModeActive: state.scratchPaint.mode === Modes.LINE
});
const mapDispatchToProps = dispatch => ({
changeLineWidth: lineWidth => {

View file

@ -1,3 +1,7 @@
import PaintEditor from './containers/paint-editor.jsx';
import ScratchPaintReducer from './reducers/scratch-paint-reducer';
export default PaintEditor;
export {
PaintEditor as default,
ScratchPaintReducer
};

View file

@ -3,8 +3,8 @@ import ReactDOM from 'react-dom';
import PaintEditor from '..';
import {Provider} from 'react-redux';
import {createStore} from 'redux';
import reducer from '../reducers/combine-reducers';
import {intlInitialState, IntlProvider} from '../reducers/intl.js';
import reducer from './reducers/combine-reducers';
import {intlInitialState, IntlProvider} from './reducers/intl.js';
const appTarget = document.createElement('div');
document.body.appendChild(appTarget);

View file

@ -0,0 +1,8 @@
import {combineReducers} from 'redux';
import intlReducer from './intl';
import {ScratchPaintReducer} from '../..';
export default combineReducers({
intl: intlReducer,
scratchPaint: ScratchPaintReducer
});

View file

@ -2,7 +2,7 @@ import {addLocaleData} from 'react-intl';
import {updateIntl as superUpdateIntl} from 'react-intl-redux';
import {IntlProvider, intlReducer} from 'react-intl-redux';
import locales from '../locale.js';
import locales from '../../locale.js';
Object.keys(locales).forEach(locale => {
// TODO: will need to handle locales not in the default intl - see www/custom-locales

View file

@ -1,12 +1,12 @@
import {combineReducers} from 'redux';
import intlReducer from './intl';
import modeReducer from './modes';
import brushModeReducer from './brush-mode';
import eraserModeReducer from './eraser-mode';
import lineModeReducer from './line-mode';
export default combineReducers({
intl: intlReducer,
mode: modeReducer,
brushMode: brushModeReducer,
eraserMode: eraserModeReducer
eraserMode: eraserModeReducer,
lineMode: lineModeReducer
});

View file

@ -1,10 +0,0 @@
{
"paint.brushMode.brush": {
"message": "Brush",
"description": "Label for the brush tool"
},
"paint.eraserMode.eraser": {
"message": "Eraser",
"description": "Label for the eraser tool"
}
}

View file

@ -1,7 +0,0 @@
[
{
"id": "paint.brushMode.brush",
"description": "Label for the brush tool",
"defaultMessage": "Brush"
}
]

View file

@ -1,7 +0,0 @@
[
{
"id": "paint.eraserMode.eraser",
"description": "Label for the eraser tool",
"defaultMessage": "Eraser"
}
]

View file

@ -1,7 +0,0 @@
[
{
"id": "paint.lineMode.line",
"description": "Label for the line tool, which draws straight line segments",
"defaultMessage": "Line"
}
]