CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 02:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug on updating flags for custom categories, adjusted starter code (#615)

Browse Source
This commit is contained in:
Emma Dauterman
2016-08-31 10:50:01 -07:00
committed by picklesrus
parent d6e71ffe38
commit 8d89e62bc8
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
demos/blocklyfactory/workspacefactory/wfactory_generator.js
View File

@@ -166,18 +166,22 @@ WorkspaceFactoryGenerator.prototype.generateInjectString = function() {
var attributes = addAttributes(this.model.options, '\t');
if (!this.model.options['readOnly']) {
attributes = '\ttoolbox : toolbox, /* TODO: Change toolbox XML ID if ' +
'necessary. Can export toolbox XML from Workspace Factory. */\n' +
attributes = '\ttoolbox : toolbox, \n' +
attributes;
}
var finalStr = 'var options = { \n' + attributes + '};';
var finalStr = '/* TODO: Change toolbox XML ID if necessary. Can export ' +
'toolbox XML from Workspace Factory. */\n' +
'var toolbox = document.getElementById("toolbox");\n\n';
finalStr += 'var options = { \n' + attributes + '};';
finalStr += '\n\n/* Inject your workspace */ \nvar workspace = Blockly.' +
'inject(/* TODO: Add ID of div to inject Blockly into */, options);';
finalStr += '\n\n/* Load Workspace Blocks from XML to workspace. ' +
'Remove if no blocks to load */' +
'\nBlockly.Xml.domToWorkspace(workspace, workspaceBlocks/*' +
' TODO: Change workspace blocks XML ID if necessary. Can export' +
' workspace blocks XML from Workspace Factory. */);';
'Remove all code below if no blocks to load */\n\n' +
'/* TODO: Change workspace blocks XML ID if necessary. Can export' +
' workspace blocks XML from Workspace Factory. */\n' +
'var workspaceBlocks = document.getElementById("workspaceBlocks"); \n\n' +
'/* Load blocks to workspace. */\n' +
'Blockly.Xml.domToWorkspace(workspace, workspaceBlocks);';
return finalStr;
}

2
demos/blocklyfactory/workspacefactory/wfactory_model.js
View File

@@ -94,7 +94,7 @@ WorkspaceFactoryModel.prototype.hasVariables = function() {
* false otherwise.
*/
WorkspaceFactoryModel.prototype.hasProcedures = function() {
return this.hasFunctionCategory;
return this.hasProcedureCategory;
};
/**