Commit 4b66806d authored by Prakhar Agarwal's avatar Prakhar Agarwal 🎯
Browse files

Fixed merge conflicts

parent 5573c5c0
......@@ -36,7 +36,6 @@
<!-- View Section -->
<li id="menu-view">
<ul class="rounded shadow">
<li id="view-zoomin"></li>
<li id="view-zoomreset"></li>
<li id="view-fullscreen"></li>
</ul>
......
......@@ -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-zoomreset": {
label: l("menu.zoomreset"),
key: pdbundle.shortcuts.menu.zoomreset_web.key,
......@@ -430,6 +424,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-zoomout": {
label: l("menu.zoomout"),
key: pdbundle.shortcuts.menu.zoomout_web.key,
......
......@@ -182,8 +182,8 @@ function add_shortcuts(cid){
shortcut += e.key.toUpperCase();
if(window.shortkeys[cid].hasOwnProperty(shortcut)){
switch(shortcut) {
case "Ctrl+=":
case "Ctrl+-":
break;
case "F11":
break;
default:
......
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