ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switched over to smarter context menu, hooked up delete button to ajax call, but not context menu yet - nor undelete. Made contextmenu detect path of object and del/undel appropriately, which also fixes a few quirks/bugs with no data in DB and trying to find the path of the first/non-existant entry

Browse Source
This commit is contained in:
Damien De Paoli
2021-06-09 21:34:16 +10:00
parent 9676738bdc
commit 7bbea21981
1 changed files with 44 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
templates/files.html
View File

@@ -1,14 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block main_content %} {% block main_content %}
<div id="contextMenu" class="dropdown-menu" role="menu" style="display:none" >
<div id="dd_file_details" class="dropdown-header" href="#">Details...</div>
<a class="dropdown-item" href="#">View File</a>
<div class="dropdown-divider"></div>
<a id="dd_move" class="dropdown-item" href="#">Move selected file(s) to new storage folder</a>
<a id="dd_del" class="dropdown-item" href="#">Delete Selected file(s)</a>
<a id="dd_undel" class="dropdown-item" href="#">UnDelete Selected file(s)</a>
</div>
<div class="container-fluid"> <div class="container-fluid">
<form id="main_form" method="POST""> <form id="main_form" method="POST"">
<input type="hidden" name="cwd" id="cwd" value="{{cwd}}"> <input type="hidden" name="cwd" id="cwd" value="{{cwd}}">
@@ -163,7 +154,7 @@
{% endif %} {% endif %}
{% if obj.type.name != "Directory" %} {% if obj.type.name != "Directory" %}
{% if (not folders) or ((obj.in_dir.in_path.path_prefix+'/'+obj.in_dir.rel_path+'/'+obj.name) | TopLevelFolderOf(cwd)) %} {% if (not folders) or ((obj.in_dir.in_path.path_prefix+'/'+obj.in_dir.rel_path+'/'+obj.name) | TopLevelFolderOf(cwd)) %}
<figure id="{{obj.id}}" img="{{loop.index-1}}" class="figure mx-1" fname="{{obj.name}}" yr="{{obj.file_details.year}}" date="{{obj.file_details.year}}{{"%02d" % obj.file_details.month}}{{"%02d" % obj.file_details.day}}" details="{{obj.name}} (Date: {{obj.file_details.day}}/{{obj.file_details.month}}/{{obj.file_details.year}})"> <figure id="{{obj.id}}" img="{{loop.index-1}}" class="figure mx-1" path_type="{{obj.in_dir.in_path.type.name}}" fname="{{obj.name}}" yr="{{obj.file_details.year}}" date="{{obj.file_details.year}}{{"%02d" % obj.file_details.month}}{{"%02d" % obj.file_details.day}}" details="{{obj.name}} (Date: {{obj.file_details.day}}/{{obj.file_details.month}}/{{obj.file_details.year}})">
{% if obj.type.name=="Image" %} {% if obj.type.name=="Image" %}
<div style="position:relative; width:100%"> <div style="position:relative; width:100%">
<a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}"><img class="thumb" height="{{size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a> <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}"><img class="thumb" height="{{size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
@@ -226,8 +217,17 @@ function GetSelnAsDiv()
return '<div class="row col-lg-12">'+seln+'</div>' return '<div class="row col-lg-12">'+seln+'</div>'
} }
function GetSelnAsData()
{
to_del=''
$('.highlight').each(function( index ) { to_del+='&eid-'+index+'='+$(this).attr('id') } )
return to_del
}
function DelDBox() function DelDBox()
{ {
to_del = GetSelnAsData()
console.log(to_del)
$('#dbox-title').html('Delete Selected File(s)') $('#dbox-title').html('Delete Selected File(s)')
div =` div =`
<div class="row col-lg-12"> <div class="row col-lg-12">
@@ -237,7 +237,9 @@ function DelDBox()
div+=` div+=`
<div class="row col-lg-12"> <div class="row col-lg-12">
<button onClick="$('#dbox').modal('hide')" class="btn btn-outline-secondary col-lg-2">Cancel</button> <button onClick="$('#dbox').modal('hide')" class="btn btn-outline-secondary col-lg-2">Cancel</button>
<button onClick="$('#dbox').modal('hide');alert('not yet');" class="btn btn-outline-danger col-lg-2">Ok</button> <button onClick="$('#dbox').modal('hide'); $.ajax({
type: 'POST', url: '/delete_files', data: to_del,
success: function(data){ console.log('Delete File(s) succeeded - TODO: need a FE msg' ); $('#status').show(); $('#status').html('TEST'); return false; } })" class="btn btn-outline-danger col-lg-2">Ok</button>
</div> </div>
` `
$('#dbox-content').html(div) $('#dbox-content').html(div)
@@ -266,7 +268,7 @@ function MoveDBox()
<br> <br>
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
<button onClick="$('#dbox').modal('hide'); return false;" class="btn btn-outline-secondary offset-lg-1 col-lg-2">Cancel</button> <button onClick="$('#dbox').modal('hide'); return false;" class="btn btn-outline-secondary offset-lg-1 col-lg-2">Cancel</button>
<button onClick="$('#dbox').modal('hide'); console.log("should do the move one day"); return false;" class="btn btn-outline-primary col-lg-2">Ok</button> <button onClick="$('#dbox').modal('hide'); console.log("TODO: should do the move one day"); return false;" class="btn btn-outline-primary col-lg-2">Ok</button>
</div> </div>
</form> </form>
` `
@@ -316,79 +318,41 @@ function DoSel(e, el)
$('.figure').click( function(e) { DoSel(e, this ); return false; }); $('.figure').click( function(e) { DoSel(e, this ); return false; });
$(document).on('click', function(e) { $('.highlight').removeClass('highlight') }); $(document).on('click', function(e) { $('.highlight').removeClass('highlight') });
(function ($, window) { $.contextMenu({
selector: '.figure',
$.fn.contextMenu = function (settings) { build: function($triggerElement, e){
if (e.currentTarget.getAttribute('path_type') == 'Bin' ) {
return this.each(function () { item_list = {
details: { name: "Details..." },
// Open context menu view: { name: "View File" },
$(this).on("contextmenu", function (e) { sep: "---",
// return native menu if pressing control move: { name: "Move selected file(s) to new storage folder" },
if (e.ctrlKey) return; undel: { name: "Undelete Selected file(s)" }
}
fd=$(e.target).closest(".figure").attr('details') } else {
$('#dd_file_details').text(fd) item_list = {
//open menu details: { name: "Details..." },
var $menu = $(settings.menuSelector) view: { name: "View File" },
.data("invokedOn", $(e.target)) sep: "---",
.show() move: { name: "Move selected file(s) to new storage folder" },
.css({ del: { name: "Delete Selected file(s)" }
position: "absolute", }
left: getMenuPosition(e.clientX, 'width', 'scrollLeft'),
top: getMenuPosition(e.clientY, 'height', 'scrollTop')
})
.off('click')
.on('click', 'a', function (e) {
$menu.hide();
var $invokedOn = $menu.data("invokedOn");
var $selectedMenu = $(e.target);
settings.menuSelected.call(this, $invokedOn, $selectedMenu);
});
return false;
});
//make sure menu closes on any click
$('body').click(function () {
$(settings.menuSelector).hide();
});
});
function getMenuPosition(mouse, direction, scrollDir) {
var win = $(window)[direction](),
scroll = $(window)[scrollDir](),
menu = $(settings.menuSelector)[direction](),
position = mouse + scroll;
// opening menu would pass the side of the page
if (mouse + menu > win && menu < mouse)
position -= menu;
return position;
} }
}; return {
})(jQuery, window); callback: function( key, options) {
console.log( $(this).attr('id') )
{# for now if we have no data, dont peak inside the first element to see if we are viewing the Bin folder and then swich the context menu #} console.log( $(this).attr('path_type') )
{% if entry_data|length > 0 %} if( key == "view" ) {
if( "{{entry_data[0].in_dir.in_path.type.name}}" == "Bin" ) { document.location.href = $(this).find('a').attr('href');
$('#dd_del').hide() }
} else { },
$('#dd_undel').hide() items: item_list
} };
{% endif %}
$(".figure").contextMenu({
menuSelector: "#contextMenu",
menuSelected: function (invokedOn, selectedMenu) {
var msg = "You selected the menu item '" + selectedMenu.text() +
"' on the file id: " + $(invokedOn).parent().parent().parent().attr('id')
console.log(msg);
if ( "View File" == selectedMenu.text() ) {
document.location.href = $(invokedOn).parent().attr('href')
}
} }
}); });
$(document).ready(function() { $(document).ready(function() {
if( {{offset}} == 0 ) if( {{offset}} == 0 )
{ {