From db061d0dffdc89e6f6c3ffa39111e3c6d205742c Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 26 Mar 2019 12:24:39 -0400
Subject: [PATCH] Make the RTL shortcuts for recent and favorite presets the
 same as LTR (close #6107)

---
 modules/ui/tools/add_favorite.js | 20 ++++++--------------
 modules/ui/tools/add_recent.js   | 20 ++++++--------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/modules/ui/tools/add_favorite.js b/modules/ui/tools/add_favorite.js
index 6f4270d93..89f62388b 100644
--- a/modules/ui/tools/add_favorite.js
+++ b/modules/ui/tools/add_favorite.js
@@ -109,20 +109,12 @@ export function uiToolAddFavorite(context) {
                 protoMode.description = t(tooltipTitleID, { feature: '<strong>' + presetName + '</strong>' });
 
                 var keyCode;
-                if (textDirection === 'ltr') {
-                    // use number row order: 1 2 3 4 5 6 7 8 9 0
-                    if (index === 9) {
-                        keyCode = 0;
-                    } else if (index < 10) {
-                        keyCode = index + 1;
-                    }
-                } else {
-                    // use number row order from right to left
-                    if (index === 0) {
-                        keyCode = 0;
-                    } else if (index < 10) {
-                        keyCode = 10 - index;
-                    }
+                // use number row order: 1 2 3 4 5 6 7 8 9 0
+                // use the same for RTL even though the layout is backward: #6107
+                if (index === 9) {
+                    keyCode = 0;
+                } else if (index < 10) {
+                    keyCode = index + 1;
                 }
                 if (keyCode !== undefined) {
                     protoMode.key = keyCode.toString();
diff --git a/modules/ui/tools/add_recent.js b/modules/ui/tools/add_recent.js
index f07ba6c41..5965bd263 100644
--- a/modules/ui/tools/add_recent.js
+++ b/modules/ui/tools/add_recent.js
@@ -146,20 +146,12 @@ export function uiToolAddRecent(context) {
 
                 var totalIndex = favoritesCount + index;
                 var keyCode;
-                if (textDirection === 'ltr') {
-                    // use number row order: 1 2 3 4 5 6 7 8 9 0
-                    if (totalIndex === 9) {
-                        keyCode = 0;
-                    } else if (totalIndex < 10) {
-                        keyCode = totalIndex + 1;
-                    }
-                } else {
-                    // use number row order from right to left
-                    if (totalIndex === 0) {
-                        keyCode = 0;
-                    } else if (totalIndex < 10) {
-                        keyCode = 10 - totalIndex;
-                    }
+                // use number row order: 1 2 3 4 5 6 7 8 9 0
+                // use the same for RTL even though the layout is backward: #6107
+                if (totalIndex === 9) {
+                    keyCode = 0;
+                } else if (totalIndex < 10) {
+                    keyCode = totalIndex + 1;
                 }
                 if (keyCode !== undefined) {
                     protoMode.key = keyCode.toString();