Commit 3f04c0ee authored by Prakhar Agarwal's avatar Prakhar Agarwal 🎯
Browse files

Merge branch 'emscripten' into pad_match_span

parents 4e765772 7c4d2a36
Pipeline #3621 failed with stage
in 0 seconds
......@@ -36,9 +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>
</ul>
</li>
......
......@@ -110,25 +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,
modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
tooltip: l("menu.zoomout_tt")
},
"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,
......@@ -436,6 +417,25 @@ 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,
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,
modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
tooltip: l("menu.zoomout_tt")
},
...view_base,
// View entries
......
......@@ -181,10 +181,16 @@ 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+0":
case "Ctrl+=":
case "Ctrl+-":
case "F11":
break;
default:
e.preventDefault()
window.shortkeys[cid][shortcut].click();
}
}
}
}
......
......@@ -275,8 +275,7 @@ text {
.comment .border {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #7569d7;
stroke-dasharray: 8 4;
}
......
......@@ -386,7 +386,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #aaa;
stroke-dasharray: 3 2;
}
......
......@@ -266,7 +266,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #aaa;
stroke-dasharray: 8 4;
}
......
......@@ -392,7 +392,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #aaa;
stroke-dasharray: 8 4;
}
......
......@@ -288,7 +288,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #5f5f5f;
stroke-dasharray: 8 4;
}
......
......@@ -283,7 +283,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #94b2b2;
stroke-dasharray: 8 4;
}
......
......@@ -283,7 +283,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #475d64;
stroke-dasharray: 8 4;
}
......
......@@ -279,7 +279,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #0b560b;
stroke-dasharray: 8 4;
}
......
......@@ -273,7 +273,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: #777;
stroke-dasharray: 8 4;
}
......
......@@ -266,7 +266,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: black;
stroke-dasharray: 8 4;
}
......
......@@ -283,7 +283,7 @@ text {
fill: none;
}
#patchsvg.editmode .comment .border {
svg[id^="patchsvg"].editmode .comment .border {
stroke: white;
stroke-dasharray: 8 4;
}
......
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