disable history mode when switching from retired to active canvas
change deploy script
This commit is contained in:
parent
1cdd9ba5cc
commit
6e65d6a403
|
@ -13,7 +13,7 @@
|
||||||
"build:client": "node scripts/build.js --client",
|
"build:client": "node scripts/build.js --client",
|
||||||
"build:dev": "webpack --config ./webpack.config.server.js && webpack --env development --config ./webpack.config.client.js && npm run minify-css",
|
"build:dev": "webpack --config ./webpack.config.server.js && webpack --env development --config ./webpack.config.client.js && npm run minify-css",
|
||||||
"update-browserlist": "browserslist --update-db",
|
"update-browserlist": "browserslist --update-db",
|
||||||
"deploy": "ssh pixelplanet /home/pixelpla/rebuild.sh",
|
"deploy": "./deployment/deploy.sh",
|
||||||
"minify-css": "node scripts/minifyCss.js",
|
"minify-css": "node scripts/minifyCss.js",
|
||||||
"babel-node": "babel-node",
|
"babel-node": "babel-node",
|
||||||
"lint": "cd $INIT_CWD && eslint --ext .jsx --ext .js",
|
"lint": "cd $INIT_CWD && eslint --ext .jsx --ext .js",
|
||||||
|
|
|
@ -369,6 +369,8 @@ export default function canvasReducer(
|
||||||
view,
|
view,
|
||||||
viewscale,
|
viewscale,
|
||||||
scale,
|
scale,
|
||||||
|
// reset if last canvas was retired
|
||||||
|
isHistoricalView: (!state.canvasEndDate && state.isHistoricalView),
|
||||||
// remember view, scale and viewscale
|
// remember view, scale and viewscale
|
||||||
prevCanvasCoords: {
|
prevCanvasCoords: {
|
||||||
...state.prevCanvasCoords,
|
...state.prevCanvasCoords,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user