frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3151 from GerwinvBeek/dev

Browse Source 
Restore tab selection after merging conflicts
This commit is contained in:
Nick O'Leary 2021-09-29 00:43:25 +01:00 committed by GitHub
commit 36bb172f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/diff.js vendored
View File

@ -1376,6 +1376,7 @@ RED.diff = (function() {
function mergeDiff(diff) { function mergeDiff(diff) {
//console.log(diff); //console.log(diff);
var selectedTab = RED.workspaces.active();
var appliedDiff = applyDiff(diff); var appliedDiff = applyDiff(diff);
var newConfig = appliedDiff.config; var newConfig = appliedDiff.config;
@ -1426,6 +1427,7 @@ RED.diff = (function() {
RED.view.redraw(true); RED.view.redraw(true);
RED.palette.refresh(); RED.palette.refresh();
RED.workspaces.refresh(); RED.workspaces.refresh();
RED.workspaces.show(selectedTab, true);
RED.sidebar.config.refresh(); RED.sidebar.config.refresh();
} }