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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	core/workspace_svg.js
This commit is contained in:
Neil Fraser
2016-04-14 00:25:25 -07:00
parent 36e0764e57 701d828090
commit e08f0aa05b
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/workspace_svg.js
View File

@@ -1105,6 +1105,9 @@ Blockly.WorkspaceSvg.prototype.setScale = function(newScale) {
// No toolbox, resize flyout.
this.flyout_.reflow();
}
// This event has been handled. Don't start a workspace drag.
e.stopPropagation();
e.preventDefault();
};
/**

2
core/zoom_controls.js
View File

@@ -166,10 +166,12 @@ Blockly.ZoomControls.prototype.createDom = function() {
Blockly.bindEvent_(zoominSvg, 'mousedown', null, function(e) {
workspace.zoomCenter(1);
e.stopPropagation(); // Don't start a workspace scroll.
e.preventDefault();
});
Blockly.bindEvent_(zoomoutSvg, 'mousedown', null, function(e) {
workspace.zoomCenter(-1);
e.stopPropagation(); // Don't start a workspace scroll.
e.preventDefault();
});
return this.svgGroup_;