diff --git a/TODO b/TODO index 3cce686..2ea3972 100644 --- a/TODO +++ b/TODO @@ -1,17 +1,6 @@ ### # 4 TEST everything (don't forget keybindings,e.g. delete) -# -- go into viewer code from a files_rbp - had red bin, bot green on viewer. -# -# consider this: - $('#viewer_bin use').attr('fill', 'var(--bs-success)'); $('#viewer_del').removeClass('btn-outline-danger').addClass('btn-outline-success') - $('#viewer_bin').hover( - function() { - $('use', this).attr('fill', 'white'); - }, - function() { - $('use', this).attr('fill', 'var(--bs-success)'); - } -); +# - from viewer, if I del, then it stays on this view, should not (OR at least) # # 5 think I killed pa_job_manager without passing an eid to a transform job, shouldn't crash # SHOULD JUST get AI to help clean-up and write defensive code here... diff --git a/internal/js/files_support.js b/internal/js/files_support.js index a8fe419..be048f6 100644 --- a/internal/js/files_support.js +++ b/internal/js/files_support.js @@ -177,7 +177,7 @@ function DelDBox(del_or_undel) div+=` '/delete_files', success: function(data){ - if( $(location).attr('pathname').match('search') !== null ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-danger col-2">Ok + if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-danger col-2">Ok ` else @@ -186,7 +186,7 @@ function DelDBox(del_or_undel) div+=` '/restore_files', success: function(data){ - if( $(location).attr('pathname').match('search') !== null ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-success col-2">Ok + if( $(location).attr('pathname').match('search') !== null || document.viewing ) { window.location='/' }; CheckForJobs() } }); return false" class="btn btn-outline-success col-2">Ok ` $('#dbox-content').html(div) diff --git a/templates/files.html b/templates/files.html index 617f648..e5a3c2e 100644 --- a/templates/files.html +++ b/templates/files.html @@ -209,14 +209,16 @@ - + {# + $.ajax({ type: 'POST', data: '&eid-0='+document.viewing.id, url: '/delete_files', success: function(data){ window.location='/'; return false; } })"> + #} {% endblock main_content %} {% block script_content %} @@ -258,7 +260,7 @@ if( fname.indexOf( "static/Import" ) == 0 ) { s+='' - tmp_path=fname.replace(imp_path,"" ) + tmp_path=fname.replace("statuc/Import","" ) } if( fname.indexOf( "static/Storage" ) == 0 ) { @@ -280,5 +282,25 @@ window.addEventListener('resize', DrawImg, false); window.addEventListener('resize', ResizeVideo, false); + // when we are in recycle bin, change colours to green & func to restore + if( window.location.href.includes('files_rbp') ) + { + $('#viewer_bin').attr('fill', 'var(--bs-success)') + // fill with bg-success colour + $('#viewer_bin use').attr('fill', 'var(--bs-success)') + $('#viewer_del').removeClass('btn-outline-danger').addClass('btn-outline-success') + $('#viewer_del').on('mouseenter', function() { + // Set the SVG fill to white + $('#viewer_bin use').attr('fill', 'white'); + }); + + // When mouse leaves the button + $('#viewer_del').on('mouseleave', function() { + // Revert the SVG fill to the bg-success colour + $('#viewer_bin use').attr('fill', 'var(--bs-success)'); + }); + $('#viewer_del').on('click', function() { DelDBox('Restore') } ) + } + {% endblock script_content %}