scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duplicate deleteOption code from merge of workspace_svg (#366)

Browse source
This commit is contained in:
Tim Mickel 2016-06-06 17:20:27 -04:00
parent d9826be497
commit e7477f63f0
1 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/workspace_svg.js
View file

@ -891,19 +891,6 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
deleteCount++;
}
}
var deleteOption = {
text: deleteCount == 1 ? Blockly.Msg.DELETE_BLOCK :
Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(deleteCount)),
enabled: deleteCount > 0,
callback: function() {
if (deleteCount < 2 ||
window.confirm(Blockly.Msg.DELETE_ALL_BLOCKS.replace('%1',
String(deleteCount)))) {
deleteNext();
}
}
};
function deleteNext() {
Blockly.Events.setGroup(eventGroup);
var block = deleteList.shift();
@ -919,13 +906,13 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
}
var deleteOption = {
text: deleteList.length == 1 ? Blockly.Msg.DELETE_BLOCK :
Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(deleteList.length)),
enabled: deleteList.length > 0,
text: deleteCount == 1 ? Blockly.Msg.DELETE_BLOCK :
Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(deleteCount)),
enabled: deleteCount > 0,
callback: function() {
if (deleteList.length < 2 ||
if (deleteCount < 2 ||
window.confirm(Blockly.Msg.DELETE_ALL_BLOCKS.replace('%1',
String(deleteList.length)))) {
String(deleteCount)))) {
deleteNext();
}
}