Skip to content

fix(developer): fixup references to layer after deleting in Touch Layout Editor #16129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcdurdin wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −24
Open

fix(developer): fixup references to layer after deleting in Touch Layout Editor #16129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions developer/src/tike/xml/layoutbuilder/layer-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ $(function() {
$('#btnDelLayer').click(function () {
if ($('#selLayer option').length == 1) return;
builder.saveUndo();
KVKL[builder.lastPlatform].layer.splice(builder.lastLayerIndex, 1);
const deletedLayer = KVKL[builder.lastPlatform].layer.splice(builder.lastLayerIndex, 1)[0];
updateNextLayerReferences(KVKL[builder.lastPlatform], deletedLayer.id, '');
builder.selectPlatform();
builder.generate(false,true);
});
Expand All @@ -45,29 +46,8 @@ $(function() {
// Layer dialogs
//

function submitLayerProperties() {
var newLayerName = $('#layerName').val();
if (!newLayerName.match(/^[a-zA-Z0-9_-]+$/)) {
alert('Layer name must contain only alphanumerics, underscore and hyphen.');
return false;
}
for(var i = 0; i < KVKL[builder.lastPlatform].layer.length; i++) {
if(i != builder.lastLayerIndex && KVKL[builder.lastPlatform].layer[i].id == newLayerName) {
alert('Layer name must not already be in use for the current platform.');
return false;
}
}

builder.saveUndo();
builder.generate();

var platform = KVKL[builder.lastPlatform];
var oldLayerName = platform.layer[builder.lastLayerIndex].id;

let fixup = function(key) {
if (key.layer == oldLayerName) {
key.layer = newLayerName;
}
function updateNextLayerReferences(platform, oldLayerName, newLayerName) {
const fixup = function(key) {
if (key.nextlayer == oldLayerName) {
key.nextlayer = newLayerName;
}
Expand All @@ -94,6 +74,28 @@ $(function() {
});
}
});
}

function submitLayerProperties() {
const newLayerName = $('#layerName').val();
if (!newLayerName.match(/^[a-zA-Z0-9_-]+$/)) {
alert('Layer name must contain only alphanumerics, underscore and hyphen.');
return false;
}
for(let i = 0; i < KVKL[builder.lastPlatform].layer.length; i++) {
if(i != builder.lastLayerIndex && KVKL[builder.lastPlatform].layer[i].id == newLayerName) {
alert('Layer name must not already be in use for the current platform.');
return false;
}
}

builder.saveUndo();
builder.generate();

const platform = KVKL[builder.lastPlatform];
const oldLayerName = platform.layer[builder.lastLayerIndex].id;

updateNextLayerReferences(platform, oldLayerName, newLayerName);

platform.layer[builder.lastLayerIndex].id = newLayerName;
builder.prepareLayers();
Expand Down