Commit b0cf108a authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

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

parents ae0fb11a fc67358a
Pipeline #3589 failed with stage
in 103 minutes and 8 seconds
......@@ -36,7 +36,6 @@
<!-- View Section -->
<li id="menu-view">
<ul class="rounded shadow">
<li id="view-zoomin"></li>
<li id="view-zoomout"></li>
<li id="view-zoomreset"></li>
<li id="view-fullscreen"></li>
......
......@@ -110,12 +110,6 @@ function menu_options(type, w, cid) {
},
// View entries
"view-zoomin": {
label: l("menu.zoomin"),
key: pdbundle.shortcuts.menu.zoomin_web.key,
modifiers: pdbundle.shortcuts.menu.zoomin_web.modifiers,
tooltip: l("menu.zoomin_tt")
},
"view-zoomout": {
label: l("menu.zoomout"),
key: pdbundle.shortcuts.menu.zoomout_web.key,
......@@ -436,6 +430,12 @@ function menu_options(type, w, cid) {
},
// View section
"view-zoomin": {
label: l("menu.zoomin"),
key: pdbundle.shortcuts.menu.zoomin_web.key,
modifiers: pdbundle.shortcuts.menu.zoomin_web.modifiers,
tooltip: l("menu.zoomin_tt")
},
...view_base,
// View entries
......
......@@ -181,10 +181,15 @@ function add_shortcuts(cid){
// Add key
shortcut += e.key.toUpperCase();
if(window.shortkeys[cid].hasOwnProperty(shortcut)){
if (shortcut!=="F11") {
e.preventDefault();
window.shortkeys[cid][shortcut].click();
}
switch(shortcut) {
case "Ctrl+=":
break;
case "F11":
break;
default:
e.preventDefault()
window.shortkeys[cid][shortcut].click();
}
}
}
}
......
Markdown is supported
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