Merge remote-tracking branch 'Google/master' into google-master-april-1

# Conflicts:
#	blockly_compressed_horizontal.js
#	blockly_uncompressed_vertical.js
#	blocks_compressed.js
#	core/block.js
#	core/block_svg.js
#	core/blockly.js
#	core/connection.js
#	core/field_textinput.js
#	core/workspace_svg.js
#	generators/lua/lists.js
#	generators/lua/text.js
#	msg/js/he.js
#	msg/js/id.js
#	msg/js/sr.js
#	msg/js/zh-hant.js
#	msg/json/en.json
This commit is contained in:
Tim Mickel 2016-04-01 14:44:46 -04:00
commit a65109f423
134 changed files with 1952 additions and 1235 deletions

View file

@ -489,7 +489,6 @@ Blockly.Toolbox.TreeControl.prototype.createNode = function(opt_html, icon) {
* @override
*/
Blockly.Toolbox.TreeControl.prototype.setSelectedItem = function(node) {
Blockly.removeAllRanges();
var toolbox = this.toolbox_;
if (node == this.selectedItem_ || node == toolbox.tree_) {
return;