Merge branch 'develop' of https://github.com/google/blockly into develop

This commit is contained in:
Sean Lip
2016-06-09 18:16:00 -07:00
16 changed files with 46 additions and 31 deletions

View File

@@ -656,7 +656,7 @@ function updatePreview() {
if (format == 'JSON') {
var json = JSON.parse(code);
Blockly.Blocks[json.id || UNNAMED] = {
Blockly.Blocks[json.type || UNNAMED] = {
init: function() {
this.jsonInit(json);
}