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

Change workspace name to playgroundWorkspace.

Browse Source
This commit is contained in:
marisaleung
2017-07-27 16:11:41 -07:00
parent 022010d722
commit 103c10eddb
13 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/blockfactory/block_option.js
View File

@@ -126,9 +126,9 @@ BlockOption.prototype.showPreviewBlock = function() {
var blockOptPreviewID = this.dom.id + '_workspace';
// Inject preview block.
var workspace = Blockly.inject(blockOptPreviewID, {readOnly:true});
Blockly.Xml.domToWorkspace(this.previewBlockXml, workspace);
this.previewWorkspace = workspace;
var demoWorkspace = Blockly.inject(blockOptPreviewID, {readOnly:true});
Blockly.Xml.domToWorkspace(this.previewBlockXml, demoWorkspace);
this.previewWorkspace = demoWorkspace;
// Center the preview block in the workspace.
this.centerBlock();

2
demos/custom-dialogs/index.html
View File

@@ -47,7 +47,7 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
</script>

2
demos/fixed/index.html
View File

@@ -38,7 +38,7 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
</script>

8
demos/generator/index.html
View File

@@ -113,16 +113,16 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
workspace);
demoWorkspace);
function showCode() {
// Generate JavaScript code and display it.
Blockly.JavaScript.INFINITE_LOOP_TRAP = null;
var code = Blockly.JavaScript.workspaceToCode(workspace);
var code = Blockly.JavaScript.workspaceToCode(demoWorkspace);
alert(code);
}
@@ -131,7 +131,7 @@
window.LoopTrap = 1000;
Blockly.JavaScript.INFINITE_LOOP_TRAP =
'if (--window.LoopTrap == 0) throw "Infinite loop.";\n';
var code = Blockly.JavaScript.workspaceToCode(workspace);
var code = Blockly.JavaScript.workspaceToCode(demoWorkspace);
Blockly.JavaScript.INFINITE_LOOP_TRAP = null;
try {
eval(code);

6
demos/headless/index.html
View File

@@ -109,9 +109,9 @@
return;
}
// Create a headless workspace.
var workspace = new Blockly.Workspace();
Blockly.Xml.domToWorkspace(xml, workspace);
var code = Blockly.Python.workspaceToCode(workspace);
var demoWorkspace = new Blockly.Workspace();
Blockly.Xml.domToWorkspace(xml, demoWorkspace);
var code = Blockly.Python.workspaceToCode(demoWorkspace);
document.getElementById('code_output').value = code;
}
</script>

12
demos/interpreter/async-execution.html
View File

@@ -132,11 +132,11 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
workspace);
demoWorkspace);
// Exit is used to signal the end of a script.
Blockly.JavaScript.addReservedWords('exit');
@@ -179,12 +179,12 @@
var latestCode = '';
function highlightBlock(id) {
workspace.highlightBlock(id);
demoWorkspace.highlightBlock(id);
highlightPause = true;
}
function resetStepUi(clearOutput) {
workspace.highlightBlock(null);
demoWorkspace.highlightBlock(null);
highlightPause = false;
runButton.disabled = '';
@@ -197,7 +197,7 @@
// Generate JavaScript code and parse it.
Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
Blockly.JavaScript.addReservedWords('highlightBlock');
latestCode = Blockly.JavaScript.workspaceToCode(workspace);
latestCode = Blockly.JavaScript.workspaceToCode(demoWorkspace);
resetStepUi(true);
}
@@ -250,7 +250,7 @@
// Load the interpreter now, and upon future changes.
generateCodeAndLoadIntoInterpreter();
workspace.addChangeListener(function(event) {
demoWorkspace.addChangeListener(function(event) {
if (!(event instanceof Blockly.Events.Ui)) {
// Something changed. Parser needs to be reloaded.
resetInterpreter();

12
demos/interpreter/step-execution.html
View File

@@ -134,11 +134,11 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
workspace);
demoWorkspace);
var outputArea = document.getElementById('output');
var stepButton = document.getElementById('stepButton');
@@ -173,12 +173,12 @@
var latestCode = '';
function highlightBlock(id) {
workspace.highlightBlock(id);
demoWorkspace.highlightBlock(id);
highlightPause = true;
}
function resetStepUi(clearOutput) {
workspace.highlightBlock(null);
demoWorkspace.highlightBlock(null);
highlightPause = false;
if (clearOutput) {
@@ -190,7 +190,7 @@
// Generate JavaScript code and parse it.
Blockly.JavaScript.STATEMENT_PREFIX = 'highlightBlock(%1);\n';
Blockly.JavaScript.addReservedWords('highlightBlock');
latestCode = Blockly.JavaScript.workspaceToCode(workspace);
latestCode = Blockly.JavaScript.workspaceToCode(demoWorkspace);
resetStepUi(true);
}
@@ -240,7 +240,7 @@
// Load the interpreter now, and upon future changes.
generateCodeAndLoadIntoInterpreter();
workspace.addChangeListener(function(event) {
demoWorkspace.addChangeListener(function(event) {
if (!(event instanceof Blockly.Events.Ui)) {
// Something changed. Parser needs to be reloaded.
generateCodeAndLoadIntoInterpreter();

6
demos/maxBlocks/index.html
View File

@@ -80,17 +80,17 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
maxBlocks: 5,
toolbox: document.getElementById('toolbox')});
function onchange(event) {
document.getElementById('capacity').textContent =
workspace.remainingCapacity();
demoWorkspace.remainingCapacity();
}
workspace.addChangeListener(onchange);
demoWorkspace.addChangeListener(onchange);
onchange();
</script>

4
demos/resizable/overlay.html
View File

@@ -66,7 +66,7 @@
<script>
var blocklyArea = document.getElementById('blocklyArea');
var blocklyDiv = document.getElementById('blocklyDiv');
var workspace = Blockly.inject(blocklyDiv,
var demoWorkspace = Blockly.inject(blocklyDiv,
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
var onresize = function(e) {
@@ -87,7 +87,7 @@
};
window.addEventListener('resize', onresize, false);
onresize();
Blockly.svgResize(workspace);
Blockly.svgResize(demoWorkspace);
</script>
</body>
</html>

4
demos/rtl/index.html
View File

@@ -23,12 +23,12 @@
</style>
<script>
function init() {
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
rtl: true,
toolbox: document.getElementById('toolbox')});
Blockly.Xml.domToWorkspace(document.getElementById('startBlocks'),
workspace);
demoWorkspace);
//window.onbeforeunload = function() {
// return 'Leaving this page will result in the loss of your work.';
//};

2
demos/storage/index.html
View File

@@ -80,7 +80,7 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});

2
demos/toolbox/index.html
View File

@@ -334,7 +334,7 @@
</xml>
<script>
var workspace = Blockly.inject('blocklyDiv',
var demoWorkspace = Blockly.inject('blocklyDiv',
{media: '../../media/',
toolbox: document.getElementById('toolbox')});
</script>

25
tests/generators/index.html
View File

@@ -73,10 +73,10 @@
<script>
'use strict';
var workspace = null;
var demoWorkspace = null;
function start() {
workspace = Blockly.inject('blocklyDiv',
demoWorkspace = Blockly.inject('blocklyDiv',
{grid:
{spacing: 25,
length: 3,
@@ -129,14 +129,14 @@ function fromXml(xmlText) {
output.value = xmlText;
output.scrollTop = 0;
output.scrollLeft = 0;
workspace.clear();
demoWorkspace.clear();
try {
var xmlDoc = Blockly.Xml.textToDom(xmlText);
} catch (e) {
alert('Error parsing XML:\n' + e);
return;
}
Blockly.Xml.domToWorkspace(xmlDoc, workspace);
Blockly.Xml.domToWorkspace(xmlDoc, demoWorkspace);
}
function setOutput(text) {
@@ -147,7 +147,8 @@ function setOutput(text) {
}
function toXml() {
var xmlDom = Blockly.Xml.workspaceToDom(workspace, /* opt_noId */ true);
var xmlDom = Blockly.Xml.workspaceToDom(demoWorkspace,
/* opt_noId */ true);
var xmlText = Blockly.Xml.domToPrettyText(xmlDom);
xmlText = xmlText.replace(/ id="\d+"/g, '');
setOutput(xmlText);
@@ -155,34 +156,34 @@ function toXml() {
function toJavaScript() {
var code = '\'use strict\';\n\n'
code += Blockly.JavaScript.workspaceToCode(workspace);
code += Blockly.JavaScript.workspaceToCode(demoWorkspace);
setOutput(code);
}
function toPython() {
var code = Blockly.Python.workspaceToCode(workspace);
var code = Blockly.Python.workspaceToCode(demoWorkspace);
setOutput(code);
}
function toPhp() {
var code = Blockly.PHP.workspaceToCode(workspace);
var code = Blockly.PHP.workspaceToCode(demoWorkspace);
setOutput(code);
}
function toLua() {
var code = Blockly.Lua.workspaceToCode(workspace);
var code = Blockly.Lua.workspaceToCode(demoWorkspace);
setOutput(code);
}
function toDart() {
var code = Blockly.Dart.workspaceToCode(workspace);
var code = Blockly.Dart.workspaceToCode(demoWorkspace);
setOutput(code);
}
function changeIndex() {
var oneBasedIndex = document.getElementById('indexing').checked;
workspace.options.oneBasedIndex = oneBasedIndex;
workspace.toolbox_.flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
demoWorkspace.options.oneBasedIndex = oneBasedIndex;
demoWorkspace.toolbox_.flyout_.workspace_.options.oneBasedIndex = oneBasedIndex;
}
</script>