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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Neil Fraser
2016-04-04 14:54:07 -07:00
parent f527c20c90 7705d2226e
commit d69209a7db
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/block_svg.js
View File

@@ -854,11 +854,6 @@ Blockly.BlockSvg.prototype.onMouseMove_ = function(e) {
// Check to see if any of this block's connections are within range of
// another block's connection.
var myConnections = this.getConnections_(false);
// Also check the last connection on this stack
var lastOnStack = this.lastConnectionInStack_();
if (lastOnStack && lastOnStack != this.nextConnection) {
myConnections.push(lastOnStack);
}
var closestConnection = null;
var localConnection = null;
var radiusConnection = Blockly.SNAP_RADIUS;
@@ -925,8 +920,9 @@ Blockly.BlockSvg.prototype.setMovable = function(movable) {
Blockly.BlockSvg.prototype.setEditable = function(editable) {
Blockly.BlockSvg.superClass_.setEditable.call(this, editable);
if (this.rendered) {
for (var i = 0; i < this.icons_.length; i++) {
this.icons_[i].updateEditable();
var icons = this.getIcons();
for (var i = 0; i < icons.length; i++) {
icons[i].updateEditable();
}
}
};

1
msg/json/pt.json
View File

@@ -28,6 +28,7 @@
"DISABLE_BLOCK": "Desabilitar Bloco",
"ENABLE_BLOCK": "Habilitar Bloco",
"HELP": "Ajuda",
"UNDO": "Desfazer",
"CHAT": "Converse com o seu colaborador, ao digitar nesta caixa!",
"AUTH": "Por favor autorize esta aplicação para permitir que o seu trabalho seja gravado e que o possa partilhar.",
"ME": "Eu",