Commit 7c4d2a36 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'prakhar/purr-data-def_reset_zoom' into emscripten

parents 5ec4ca88 9b5efdaa
Pipeline #3614 failed with stage
in 105 minutes and 14 seconds
......@@ -36,7 +36,6 @@
<!-- View Section -->
<li id="menu-view">
<ul class="rounded shadow">
<li id="view-zoomreset"></li>
<li id="view-fullscreen"></li>
</ul>
</li>
......
......@@ -110,13 +110,6 @@ function menu_options(type, w, cid) {
},
// View entries
"view-zoomreset": {
label: l("menu.zoomreset"),
key: pdbundle.shortcuts.menu.zoomreset_web.key,
modifiers: pdbundle.shortcuts.menu.zoomreset_web.modifiers,
tooltip: l("menu.zoomreset_tt"),
top_hr: {}
},
"view-fullscreen": {
label: l("menu.fullscreen"),
key: pdbundle.shortcuts.menu.fullscreen_web.key,
......@@ -424,6 +417,13 @@ function menu_options(type, w, cid) {
},
// View section
"view-zoomreset": {
label: l("menu.zoomreset"),
key: pdbundle.shortcuts.menu.zoomreset_web.key,
modifiers: pdbundle.shortcuts.menu.zoomreset_web.modifiers,
tooltip: l("menu.zoomreset_tt"),
top_hr: {}
},
"view-zoomin": {
label: l("menu.zoomin"),
key: pdbundle.shortcuts.menu.zoomin_web.key,
......
......@@ -182,6 +182,7 @@ function add_shortcuts(cid){
shortcut += e.key.toUpperCase();
if(window.shortkeys[cid].hasOwnProperty(shortcut)){
switch(shortcut) {
case "Ctrl+0":
case "Ctrl+=":
case "Ctrl+-":
case "F11":
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment