loleaflet/dist/loleaflet-help.html | 1 +
loleaflet/src/map/handler/Map.Keyboard.js | 6 ++++++
2 files changed, 7 insertions(+)
New commits:
commit 2cfa01a57325e6dcb495628276306c760fded3b3
Author: Henry Castro <hcas...@collabora.com>
Date: Sat Jan 7 08:44:35 2017 -0400
tdf#103779: Help menu accessibility, part 3
Change shortcut to Ctrl + Shift + ?
(cherry picked from commit e1b7e53b3a6f006eec5728c3ec88079c34b4f3c6)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/dist/loleaflet-help.html
b/loleaflet/dist/loleaflet-help.html
index bfed701..15c79d3 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,7 +31,7 @@
<tr> <td class="function">Cut</td> <td class="shortcut">Ctrl +
X</td> </tr>
<tr> <td class="function">Paste as unformatted text</td> <td
class="shortcut">Ctrl + Alt + Shift + V</td> </tr>
<tr> <td class="function">Print (Download as PDF)</td> <td
class="shortcut">Ctrl + P</td> </tr>
- <tr> <td class="function">Display the Keyboard shortcuts help</td>
<td class="shortcut">Ctrl + H</td> </tr>
+ <tr> <td class="function">Display the Keyboard shortcuts help</td>
<td class="shortcut">Ctrl + Shift + ?</td> </tr>
</table>
</div>
<div id="text-shortcuts" style="display: none;">
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 1d91309..9422a9b 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -385,7 +385,7 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
- if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' ||
e.originalEvent.key === 'H')) {
+ if (e.originalEvent.ctrlKey && e.originalEvent.shiftKey &&
e.originalEvent.key === '?') {
map.showLOKeyboardHelp();
e.originalEvent.preventDefault();
return true;
commit 1484ed44e0569c96967e5b5e659d9d3ad4c42ba9
Author: Henry Castro <hcas...@collabora.com>
Date: Fri Jan 6 23:11:48 2017 -0400
tdf#103779: Help menu accessibility, part 2
Add a keyboard shortcut ctrl + h to display the
Keyboard shortcuts help
(cherry picked from commit 73cf6f71fbe1ccb1946958b06e8deab16176a82c)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/loleaflet/dist/loleaflet-help.html
b/loleaflet/dist/loleaflet-help.html
index 2184635..bfed701 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,6 +31,7 @@
<tr> <td class="function">Cut</td> <td class="shortcut">Ctrl +
X</td> </tr>
<tr> <td class="function">Paste as unformatted text</td> <td
class="shortcut">Ctrl + Alt + Shift + V</td> </tr>
<tr> <td class="function">Print (Download as PDF)</td> <td
class="shortcut">Ctrl + P</td> </tr>
+ <tr> <td class="function">Display the Keyboard shortcuts help</td>
<td class="shortcut">Ctrl + H</td> </tr>
</table>
</div>
<div id="text-shortcuts" style="display: none;">
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index 62e61db..1d91309 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -385,6 +385,12 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
+ if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' ||
e.originalEvent.key === 'H')) {
+ map.showLOKeyboardHelp();
+ e.originalEvent.preventDefault();
+ return true;
+ }
+
if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'z' ||
e.originalEvent.key === 'Z')) {
this._map._socket.sendMessage('uno .uno:Undo');
e.originalEvent.preventDefault();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
