Commit ecf4766b authored by carlosperate's avatar carlosperate

Update zoom settings based on latest Blockly changes.

Also updates blockly README file to synchronise with blockly upstream differences.
parent 06c22374
...@@ -56,6 +56,7 @@ Ardublockly.injectBlockly = function(blocklyEl, toolboxPath, blocklyPath) { ...@@ -56,6 +56,7 @@ Ardublockly.injectBlockly = function(blocklyEl, toolboxPath, blocklyPath) {
css: true, css: true,
disable: true, disable: true,
grid: false, grid: false,
maxBlocks: Infinity,
media: blocklyPath + '/media/', media: blocklyPath + '/media/',
rtl: false, rtl: false,
scrollbars: true, scrollbars: true,
...@@ -63,12 +64,12 @@ Ardublockly.injectBlockly = function(blocklyEl, toolboxPath, blocklyPath) { ...@@ -63,12 +64,12 @@ Ardublockly.injectBlockly = function(blocklyEl, toolboxPath, blocklyPath) {
toolbox: xmlTree, toolbox: xmlTree,
trashcan: true, trashcan: true,
zoom: { zoom: {
enabled: true,
controls: true, controls: true,
wheel: false, wheel: false,
startScale: 1.0, startScale: 1.0,
maxScale: 3, maxScale: 2,
minScale: 0.3 minScale: 0.2,
scaleSpeed: 1.2
} }
}); });
Ardublockly.BLOCKLY_INJECTED_ = true; Ardublockly.BLOCKLY_INJECTED_ = true;
......
...@@ -12,8 +12,8 @@ It adds the following features: ...@@ -12,8 +12,8 @@ It adds the following features:
* Code warnings * Code warnings
* Arduino pin tracking * Arduino pin tracking
* Arduino generator unit test (incomplete) * Arduino generator unit test (incomplete)
* Procedures and flyout core classes modified to include the Arduino setup() and loop() functions * Procedures core class modified to include the Arduino setup() and loop() functions
* Minor visual changes to the zoom icons * Minor visual changes to the zoom icons positioning
All other changes and fixes have been submitted to the original Blockly repository for inclusion into the upstream master branch. All other changes and fixes have been submitted to the original Blockly repository for inclusion into the upstream master branch.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment