Skip to content

Commit 8967a15

Browse files
committed
The short main menu has auto closed items
1 parent 0af476c commit 8967a15

File tree

1 file changed

+26
-19
lines changed

1 file changed

+26
-19
lines changed

src/graph_minmax_setting_menu.js

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
138138
$('input[name=power]',selected_curve).val(power);
139139
$('input[name=smoothing]',selected_curve).val(smoothing);
140140
RefreshCharts();
141+
closeMinMaxContextMenu();
141142
}
142143

143144
function SetSelectedCurveMinMaxToFullRangeDuringAllTime () {
@@ -274,7 +275,11 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
274275
const top = item.offsetTop + (isSubmenuLevel2 ? main_menu[0].children[8].offsetTop : 0);
275276
positionMenu(menu, left, top);
276277
showMenu(menu);
277-
disablePointerEvents(prev_menu);
278+
279+
if (isSubmenuLevel2)
280+
disablePointerEvents(prev_menu);
281+
else
282+
DeactivateMainMenu(prev_menu);
278283

279284
if (isSubmenuLevel2) {
280285
$('.back-submenu').removeClass('menu-button');
@@ -289,8 +294,8 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
289294
}
290295
else {
291296
SetAllMinMaxToFullRangeDuringAllTime();
292-
closeMinMaxContextMenu();
293297
}
298+
closeMinMaxContextMenu();
294299
return;
295300
}
296301

@@ -433,6 +438,7 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
433438
$('input[name=MinValue]', selected_curve).val(Min.toFixed(0));
434439
$('input[name=MaxValue]', selected_curve).val(Max.toFixed(0));
435440
RefreshCharts();
441+
closeMinMaxContextMenu();
436442
}
437443

438444
function ShowCurvesToSetMinMaxCheckboxedMenu (e) {
@@ -667,23 +673,6 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
667673
}
668674
}
669675

670-
function ShowThisCurvesActionSubmenu() {
671-
hideMenu(sub_menu);
672-
673-
FillThisCurveActionsIntoMenu(sub_menu, false);
674-
675-
elem = $('<div class="menu-button iconDiv back-submenu">&#9668;Back</div>');
676-
elem.click(function () {
677-
hideMenu(sub_menu);
678-
ActivateMainMenu(main_menu);
679-
});
680-
sub_menu.append(elem);
681-
682-
positionMenu(sub_menu, this.clientWidth, this.offsetTop);
683-
showMenu(sub_menu);
684-
DeactivateMainMenu(main_menu);
685-
}
686-
687676
function addKeyboardEvents() {
688677
$(document).keydown( function (e) {
689678
const mainMenu = $(".main_menu.show");
@@ -732,6 +721,24 @@ export function showMinMaxSetupContextMenu(menu_pos_x, menu_pos_y, selected_fiel
732721
});
733722
}
734723

724+
function ShowThisCurvesActionSubmenu() {
725+
hideMenu(sub_menu);
726+
727+
FillThisCurveActionsIntoMenu(sub_menu, false);
728+
729+
elem = $('<div class="menu-button iconDiv back-submenu">&#9668;Back</div>');
730+
elem.click(function () {
731+
hideMenu(sub_menu);
732+
ActivateMainMenu(main_menu);
733+
});
734+
sub_menu.append(elem);
735+
736+
positionMenu(sub_menu, this.clientWidth, this.offsetTop);
737+
showMenu(sub_menu);
738+
DeactivateMainMenu(main_menu);
739+
}
740+
741+
735742
function FillThisCurveActionsIntoMenu (menu, is_main_menu) {
736743
let elem = $('<div> Default</div>');
737744
elem.click(SetSelectedCurveMinMaxToDefault);

0 commit comments

Comments
 (0)