From 6e65d6a403543027d7fc9c345c1cffcd4daf0758 Mon Sep 17 00:00:00 2001 From: HF Date: Fri, 5 Jan 2024 11:09:56 +0100 Subject: [PATCH] disable history mode when switching from retired to active canvas change deploy script --- package.json | 2 +- src/store/reducers/canvas.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b413527..41001647 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "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", "update-browserlist": "browserslist --update-db", - "deploy": "ssh pixelplanet /home/pixelpla/rebuild.sh", + "deploy": "./deployment/deploy.sh", "minify-css": "node scripts/minifyCss.js", "babel-node": "babel-node", "lint": "cd $INIT_CWD && eslint --ext .jsx --ext .js", diff --git a/src/store/reducers/canvas.js b/src/store/reducers/canvas.js index 6433843f..397ea969 100644 --- a/src/store/reducers/canvas.js +++ b/src/store/reducers/canvas.js @@ -369,6 +369,8 @@ export default function canvasReducer( view, viewscale, scale, + // reset if last canvas was retired + isHistoricalView: (!state.canvasEndDate && state.isHistoricalView), // remember view, scale and viewscale prevCanvasCoords: { ...state.prevCanvasCoords,