Keyboard Trigger UI: Use new getShortKeyLabel in pixl-xyapp. Also fix capitalization in getKeyLabel.

Author: jhuckaby

htdocs/js/pages/Base.class.js

@@ -1665,11 +1665,11 @@ Page.Base = class Base extends Page {
 		return '<i class="mdi mdi-' + icon + '">&nbsp;</i>' + title;
 	}
 
-	getNiceHotKeyListText(keys, glue = ', ') {
+	getShortHotKeyListText(keys, glue = ', ') {
 		// get text list of hot keys
 		var self = this;
 		if (!keys || !keys.length) return '';
-		return keys.map( function(key) { return KeySelect.getkeyLabel(key); } ).join(glue);
+		return keys.map( function(key) { return KeySelect.getShortKeyLabel(key); } ).join(glue);
 	}
 
 	getNiceHotKeyList(keys, glue = ', ') {
@@ -1681,7 +1681,7 @@ Page.Base = class Base extends Page {
 
 	getNiceHotKey(key) {
 		// get nice hot key for display
-		var label = KeySelect.getkeyLabel(key);
+		var label = KeySelect.getKeyLabel(key);
 		return `<span class="hot_key">${label}</span>`;
 	}
 

htdocs/js/pages/Events.class.js

@@ -3190,7 +3190,7 @@ Page.Events = class Events extends Page.PageUtils {
 				id: 'fe_et_keyboard_keys',
 				title: 'Type new key combo:',
 				placeholder: '(None)',
-				options: (trigger.keys || []).map( function(key) { return { id: key, title: KeySelect.getkeyLabel(key) }; } ),
+				options: (trigger.keys || []).map( function(key) { return { id: key, title: KeySelect.getKeyLabel(key) }; } ),
 				values: trigger.keys || [],
 				icon: 'keyboard-outline',
 				default_icon: 'keyboard-outline',

htdocs/js/pages/PageUtils.class.js

@@ -5188,8 +5188,8 @@ Page.PageUtils = class PageUtils extends Page.Base {
 				nice_icon = '<i class="mdi mdi-gesture-tap-button"></i>';
 				nice_type = 'On-Demand';
 				alt_type = 'Keyboard';
-				nice_desc = '<i class="mdi mdi-keyboard-outline">&nbsp;</i><b>Keyboard:</b> ' + this.getNiceHotKeyListText(item.keys || []);
-				short_desc = this.getNiceHotKeyListText(item.keys || []);
+				nice_desc = '<i class="mdi mdi-keyboard-outline">&nbsp;</i><b>Keyboard:</b> ' + this.getShortHotKeyListText(item.keys || []);
+				short_desc = this.getShortHotKeyListText(item.keys || []);
 			break;
 
 			case 'catchup':

htdocs/js/pages/user/MySettings.class.js

@@ -600,7 +600,7 @@ Page.MySettings = class MySettings extends Page.Base {
 				id: 'fe_hot_keys',
 				title: 'Type new key combo:',
 				placeholder: '(None)',
-				options: values.map( function(key) { return { id: key, title: KeySelect.getkeyLabel(key) }; } ),
+				options: values.map( function(key) { return { id: key, title: KeySelect.getKeyLabel(key) }; } ),
 				values: values,
 				icon: 'keyboard-outline',
 				default_icon: 'keyboard-outline',