Skip to content

Fix fileTree dropdown closing when clicking scrollbar #2492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgutt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix fileTree dropdown closing when clicking scrollbar #2492

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions emhttp/plugins/dynamix/Browse.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ function autoscale(value) {
return ((Math.round(scale*data)/scale)+' '+unit[base]).replace('.','<?=$display['number'][0]?>')+'/s';
}

function preventFileTreeClose() {
// Prevent fileTree dropdown from closing when clicking inside the dialog
// by stopping mousedown events from bubbling to the document handler
$('.ui-dfm').off('mousedown.dfmFileTree').on('mousedown.dfmFileTree', function(e) {
e.stopPropagation();
});
}

function folderContextMenu(id, button) {
var opts = [];
context.settings({button:button});
Expand Down Expand Up @@ -482,6 +490,9 @@ function doAction(action, title, id) {
resizable: false,
draggable: false,
modal: true,
close: function() {
$('.ui-dfm').off('mousedown.dfmFileTree');
},
buttons: {
"_(Start)_": function(){
if (dfm.running) return;
Expand Down Expand Up @@ -592,6 +603,7 @@ function doAction(action, title, id) {
}
});
dfm_close_button();
preventFileTreeClose();
if (action == 15) $('.ui-dfm .ui-dialog-buttonset button:eq(1)').prop('disabled',true);
setTimeout(function(){if (dfm.window.find('#dfm_target').length) dfm.window.find('#dfm_target').focus().click(); else $('.ui-dfm .ui-dialog-buttonset button:eq(0)').focus();});
}
Expand Down Expand Up @@ -749,6 +761,9 @@ function doActions(action, title) {
resizable: false,
draggable: false,
modal: true,
close: function() {
$('.ui-dfm').off('mousedown.dfmFileTree');
},
buttons: {
"_(Start)_": function(){
if (dfm.running) return;
Expand Down Expand Up @@ -862,6 +877,7 @@ function doActions(action, title) {
}
});
dfm_close_button();
preventFileTreeClose();
if (action == 15) $('.ui-dfm .ui-dialog-buttonset button:eq(1)').prop('disabled',true);
setTimeout(function(){if (dfm.window.find('#dfm_target').length) dfm.window.find('#dfm_target').focus().click(); else $('.ui-dfm .ui-dialog-buttonset button:eq(0)').focus();});
}
Expand Down
Loading