From 9323a01c354bb19b1d09c2cc46d9a1dfcb9ff116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 4 Apr 2016 07:11:13 +0200 Subject: [PATCH 1/3] Localisation updates from https://translatewiki.net. --- msg/json/pt.json | 1 + 1 file changed, 1 insertion(+) diff --git a/msg/json/pt.json b/msg/json/pt.json index 5b7a7b89a..58b5d43ad 100644 --- a/msg/json/pt.json +++ b/msg/json/pt.json @@ -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", From a26fe6acf841dc495932ad5c3390d7599de220b6 Mon Sep 17 00:00:00 2001 From: rachel-fenichel Date: Mon, 4 Apr 2016 11:10:05 -0700 Subject: [PATCH 2/3] Disable connecting to last block in stack --- core/block_svg.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/core/block_svg.js b/core/block_svg.js index f31bbf035..6585024bf 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -846,11 +846,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; From f7e455e856bda15b9a470398161fd871f1422b57 Mon Sep 17 00:00:00 2001 From: miguel76 Date: Mon, 4 Apr 2016 18:09:18 -0300 Subject: [PATCH 3/3] Fix #313 --- core/block_svg.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/block_svg.js b/core/block_svg.js index f31bbf035..9215d24d8 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -917,8 +917,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(); } } };