Commit 590707b2 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

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

parents cfd09b29 49c055d5
Pipeline #3685 canceled with stage
...@@ -33,14 +33,6 @@ ...@@ -33,14 +33,6 @@
</ul> </ul>
</li> </li>
<!-- View Section -->
<li id="menu-view">
<ul class="rounded shadow">
<li id="view-fullscreen"></li>
</ul>
</li>
<!-- Media section --> <!-- Media section -->
<li id="menu-media"> <li id="menu-media">
<ul class="rounded shadow"> <ul class="rounded shadow">
......
...@@ -107,15 +107,6 @@ function menu_options(type, w, cid) { ...@@ -107,15 +107,6 @@ function menu_options(type, w, cid) {
onclick: function () { menu_section_click("menu-view" + cid) }, onclick: function () { menu_section_click("menu-view" + cid) },
onmousemove: function () { menu_section_move("menu-view" + cid) } onmousemove: function () { menu_section_move("menu-view" + cid) }
} }
},
// View entries
"view-fullscreen": {
label: l("menu.fullscreen"),
key: pdbundle.shortcuts.menu.fullscreen_web.key,
modifiers: pdbundle.shortcuts.menu.fullscreen_web.modifiers,
tooltip: l("menu.fullscreen_tt"),
top_hr: {}
} }
} }
...@@ -185,10 +176,6 @@ function menu_options(type, w, cid) { ...@@ -185,10 +176,6 @@ function menu_options(type, w, cid) {
modifiers: pdbundle.shortcuts.menu.preferences_web.modifiers, modifiers: pdbundle.shortcuts.menu.preferences_web.modifiers,
tooltip: l("menu.preferences_tt") tooltip: l("menu.preferences_tt")
}, },
// View
...view_base,
// Media section // Media section
"menu-media": { "menu-media": {
label: l("menu.media"), label: l("menu.media"),
...@@ -417,6 +404,8 @@ function menu_options(type, w, cid) { ...@@ -417,6 +404,8 @@ function menu_options(type, w, cid) {
}, },
// View section // View section
...view_base,
// View entries
"view-zoomreset": { "view-zoomreset": {
label: l("menu.zoomreset"), label: l("menu.zoomreset"),
key: pdbundle.shortcuts.menu.zoomreset_web.key, key: pdbundle.shortcuts.menu.zoomreset_web.key,
...@@ -436,9 +425,13 @@ function menu_options(type, w, cid) { ...@@ -436,9 +425,13 @@ function menu_options(type, w, cid) {
modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers, modifiers: pdbundle.shortcuts.menu.zoomout_web.modifiers,
tooltip: l("menu.zoomout_tt") tooltip: l("menu.zoomout_tt")
}, },
...view_base, "view-fullscreen": {
label: l("menu.fullscreen"),
// View entries key: pdbundle.shortcuts.menu.fullscreen_web.key,
modifiers: pdbundle.shortcuts.menu.fullscreen_web.modifiers,
tooltip: l("menu.fullscreen_tt"),
top_hr: {}
},
"view-optimalzoom": { "view-optimalzoom": {
label: l("menu.zoomoptimal"), label: l("menu.zoomoptimal"),
key: pdbundle.shortcuts.menu.zoomoptimal_web.key, key: pdbundle.shortcuts.menu.zoomoptimal_web.key,
......
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