Add 'media' config option. Deprecate 'path' config option.

This commit is contained in:
Neil Fraser
2014-11-09 16:02:24 -08:00
parent 49fa610f0b
commit 0cb49f2682
29 changed files with 95 additions and 91 deletions

View File

@@ -454,8 +454,7 @@ function init() {
window.addEventListener('resize', onresize);
var toolbox = document.getElementById('toolbox');
Blockly.inject(document.getElementById('blockly'),
{path: '../../', toolbox: toolbox});
Blockly.inject(document.getElementById('blockly'), {toolbox: toolbox});
// Create the root block.
if ('BlocklyStorage' in window && window.location.hash.length > 1) {

View File

@@ -53,7 +53,7 @@ function updateFunc(type, code) {
*/
function init() {
var rtl = (document.location.search == '?rtl');
Blockly.inject(document.body, {path: '../../', rtl: rtl});
Blockly.inject(document.body, {rtl: rtl});
try {
// Let the top-level application know that Blockly is ready.

View File

@@ -39,7 +39,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
</script>
</body>

View File

@@ -65,7 +65,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
function showCode() {
// Generate JavaScript code and display it.

View File

@@ -21,7 +21,7 @@
<script>
function init() {
Blockly.inject(document.body,
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
// Let the top-level application know that Blockly is ready.
window.parent.blocklyLoaded(Blockly);
}

View File

@@ -73,7 +73,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
var myInterpreter = null;

View File

@@ -80,7 +80,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', maxBlocks: 5, toolbox: document.getElementById('toolbox')});
{maxBlocks: 5, toolbox: document.getElementById('toolbox')});
function onchange() {
document.getElementById('capacity').innerHTML = Blockly.mainWorkspace.remainingCapacity();

View File

@@ -66,7 +66,7 @@
// to set up your app for realtime collaboration and how to get the
// clientId that you need below.
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox'),
{toolbox: document.getElementById('toolbox'),
realtime: true,
realtimeOptions:
{clientId: 'YOUR CLIENT ID HERE',

View File

@@ -23,7 +23,7 @@
<script>
function init() {
Blockly.inject(document.getElementById('svgDiv'),
{path: '../../', rtl: true, toolbox: document.getElementById('toolbox')});
{rtl: true, toolbox: document.getElementById('toolbox')});
Blockly.Xml.domToWorkspace(Blockly.mainWorkspace,
document.getElementById('startBlocks'));
//window.onbeforeunload = function() {
@@ -130,7 +130,6 @@
</block>
<block type="text_length"></block>
<block type="text_isEmpty"></block>
<block type="text_endString"></block>
<block type="text_indexOf"></block>
<block type="text_charAt"></block>
<block type="text_changeCase"></block>

View File

@@ -81,7 +81,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
// An href with #key trigers an AJAX call to retrieve saved blocks.
if ('BlocklyStorage' in window && window.location.hash.length > 1) {

View File

@@ -341,7 +341,7 @@
<script>
Blockly.inject(document.getElementById('blocklyDiv'),
{path: '../../', toolbox: document.getElementById('toolbox')});
{toolbox: document.getElementById('toolbox')});
</script>
</body>