From d4440d51657f5ffae232802b5b482172838b5296 Mon Sep 17 00:00:00 2001 From: Batalov Sergey Date: Thu, 25 Aug 2016 16:04:47 +0500 Subject: [PATCH 1/2] Fix reversed right/left in RTL --- core/toolbox.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/toolbox.js b/core/toolbox.js index 4af1b1dd9..77be45d4b 100644 --- a/core/toolbox.js +++ b/core/toolbox.js @@ -605,8 +605,10 @@ Blockly.Toolbox.TreeNode.prototype.onDoubleClick_ = function(e) { Blockly.Toolbox.TreeNode.prototype.onKeyDown = function(e) { if (this.horizontalLayout_) { var map = {}; - map[goog.events.KeyCodes.RIGHT] = goog.events.KeyCodes.DOWN; - map[goog.events.KeyCodes.LEFT] = goog.events.KeyCodes.UP; + var next = goog.events.KeyCodes.DOWN + var prev = goog.events.KeyCodes.UP + map[goog.events.KeyCodes.RIGHT] = this.rightToLeft_ ? prev : next; + map[goog.events.KeyCodes.LEFT] = this.rightToLeft_ ? next : prev; map[goog.events.KeyCodes.UP] = goog.events.KeyCodes.LEFT; map[goog.events.KeyCodes.DOWN] = goog.events.KeyCodes.RIGHT; From ab101ee3b780001e2fa1292f01a7fff8f2a3db4a Mon Sep 17 00:00:00 2001 From: Batalov Sergey Date: Thu, 25 Aug 2016 16:07:36 +0500 Subject: [PATCH 2/2] TreeSeparator node did not know about horiz. layout. Fixed. --- core/toolbox.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/toolbox.js b/core/toolbox.js index 77be45d4b..d559b577d 100644 --- a/core/toolbox.js +++ b/core/toolbox.js @@ -542,7 +542,6 @@ Blockly.Toolbox.TreeControl.prototype.setSelectedItem = function(node) { Blockly.Toolbox.TreeNode = function(toolbox, html, opt_config, opt_domHelper) { goog.ui.tree.TreeNode.call(this, html, opt_config, opt_domHelper); if (toolbox) { - this.horizontalLayout_ = toolbox.horizontalLayout_; var resize = function() { // Even though the div hasn't changed size, the visible workspace // surface of the workspace has, so we may need to reposition everything. @@ -603,7 +602,7 @@ Blockly.Toolbox.TreeNode.prototype.onDoubleClick_ = function(e) { * @private */ Blockly.Toolbox.TreeNode.prototype.onKeyDown = function(e) { - if (this.horizontalLayout_) { + if (this.tree.toolbox_.horizontalLayout_) { var map = {}; var next = goog.events.KeyCodes.DOWN var prev = goog.events.KeyCodes.UP