mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Merge pull request #3151 from GerwinvBeek/dev
Restore tab selection after merging conflicts
This commit is contained in:
commit
36bb172f29
@ -1376,6 +1376,7 @@ RED.diff = (function() {
|
||||
|
||||
function mergeDiff(diff) {
|
||||
//console.log(diff);
|
||||
var selectedTab = RED.workspaces.active();
|
||||
var appliedDiff = applyDiff(diff);
|
||||
|
||||
var newConfig = appliedDiff.config;
|
||||
@ -1426,6 +1427,7 @@ RED.diff = (function() {
|
||||
RED.view.redraw(true);
|
||||
RED.palette.refresh();
|
||||
RED.workspaces.refresh();
|
||||
RED.workspaces.show(selectedTab, true);
|
||||
RED.sidebar.config.refresh();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user