Skip to content

Commit 47ba6ef

Browse files
author
Daniel Herzog
committed
Made keyboard test work with shortcut map instead of static list
1 parent 50765da commit 47ba6ef

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

test-scripts/test-scripts/keyidentifier.html

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
</script>
1515

1616
<script src="../../src/ui-scripts/actions/keyidentifier.js"></script>
17+
<script src="../../src/scripts/ini.js"></script>
18+
<script src="../../src/lib/arrayprototype.js"></script>
1719
<script>
1820

1921
var onshortcut = function(shortcut, event)
@@ -37,17 +39,19 @@
3739

3840
window.onload = function()
3941
{
40-
var sc =
41-
[
42-
"ctrl a", "ctrl b", "shift ctrl a",
43-
"up","down","left","right",
44-
"enter","ctrl enter",
45-
"shift tab","tab", "ctrl tab",
46-
"escape", "shift escape",
47-
"a", "(", ")", "s", "f6", ".", "[",
48-
"ctrl p", "page-down", "page-up",
49-
"cmd a", "cmd k"
50-
];
42+
var sc_map = window.ini.default_shortcuts;
43+
var sc = [];
44+
for (var view in sc_map)
45+
{
46+
for (var mode in sc_map[view])
47+
{
48+
for (var shortcut in sc_map[view][mode])
49+
{
50+
if (!sc.contains(shortcut))
51+
sc.push(shortcut);
52+
}
53+
}
54+
}
5155
var ki = new KeyIdentifier(onshortcut, window.chrome ? "chrome" : window.opera ?"opera" : "firefox");
5256
document.getElementsByTagName('pre')[0].textContent = sc.join('\n');
5357
ki.set_shortcuts(sc);

0 commit comments

Comments
 (0)