Bug 1515736 - [release 111] Add a + notation in between shortcut labels (#7507). r=lsmyth
authorJason Laster <jlaster@mozilla.com>
Fri, 21 Dec 2018 11:51:07 -0500
changeset 508834 e121cba5379cb25f609de3441fc3e6ac79ca547e
parent 508833 1bc7f0ea547fa2a2c792295311ff75f37f494378
child 508835 d1b71eed209c543cd73cee879310483e07abe803
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsmyth
bugs1515736
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1515736 - [release 111] Add a + notation in between shortcut labels (#7507). r=lsmyth
devtools/client/debugger/new/src/utils/text.js
--- a/devtools/client/debugger/new/src/utils/text.js
+++ b/devtools/client/debugger/new/src/utils/text.js
@@ -30,18 +30,18 @@ export function formatKeyShortcut(shortc
   if (isMacOS) {
     return shortcut
       .replace(/Shift\+/g, "\u21E7 ")
       .replace(/Command\+|Cmd\+/g, "\u2318 ")
       .replace(/CommandOrControl\+|CmdOrCtrl\+/g, "\u2318 ")
       .replace(/Alt\+/g, "\u2325 ");
   }
   return shortcut
-    .replace(/CommandOrControl\+|CmdOrCtrl\+/g, `${L10N.getStr("ctrl")} `)
-    .replace(/Shift\+/g, "Shift ");
+    .replace(/CommandOrControl\+|CmdOrCtrl\+/g, `${L10N.getStr("ctrl")}+`)
+    .replace(/Shift\+/g, "Shift+");
 }
 
 /**
  * Truncates the received text to the maxLength in the format:
  * Original: 'this is a very long text and ends here'
  * Truncated: 'this is a ver...and ends here'
  * @param {String} sourceText - Source text
  * @param {Number} maxLength - Max allowed length