CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-06 08:30:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cherrypick fixes made directly to master back into develop (#619)

Browse Source 
* Check result of window.confirm before deleting variables.

* Create CONTRIBUTING.md
This commit is contained in:
picklesrus
2016-09-07 11:50:50 -07:00
committed by GitHub
parent 953fb9f1b4
commit dab7fd5751
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,5 @@
# Contributing to Blockly
Please make pull requests against develop, not master. If your patch needs to go into master immediately, include a note in your PR.
For more information, head over to the [Blockly Developers site](https://developers.google.com/blockly/guides/modify/contributing).

5
core/workspace.js
View File

@@ -322,9 +322,12 @@ Blockly.Workspace.prototype.deleteVariable = function(name) {
return; return;
} }
} }
window.confirm( var ok = window.confirm(
Blockly.Msg.DELETE_VARIABLE_CONFIRMATION.replace('%1', uses.length). Blockly.Msg.DELETE_VARIABLE_CONFIRMATION.replace('%1', uses.length).
replace('%2', name)); replace('%2', name));
if (!ok) {
return;
}
} }
Blockly.Events.setGroup(true); Blockly.Events.setGroup(true);