1
0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-09 09:36:29 +02:00

execute correct action, when clicking on a file icon

This commit is contained in:
Marco Dickert
2017-08-19 01:48:29 +02:00
parent 69239609a0
commit 8fc6218319
3 changed files with 18 additions and 15 deletions

View File

@@ -1332,16 +1332,17 @@ function IFM( params ) {
filetable.tBodies[0].addEventListener( 'click', function( e ) {
if( e.target.tagName == "TD" && e.target.parentElement.classList.contains( 'clickable-row' ) && e.target.parentElement.dataset.filename !== ".." && e.ctrlKey )
e.target.parentElement.classList.toggle( 'selectedItem' );
else if( e.target.classList.contains( 'ifmitem' ) ) {
else if( e.target.classList.contains( 'ifmitem' ) || e.target.parentElement.classList.contains( 'ifmitem' ) ) {
e.stopPropagation();
e.preventDefault();
if( e.target.dataset.type == "dir" )
self.changeDirectory( e.target.parentElement.parentElement.dataset.filename );
ifmitem = ( e.target.classList.contains( 'ifmitem' ) ? e.target : e.target.parentElement );
if( ifmitem.dataset.type == "dir" )
self.changeDirectory( ifmitem.parentElement.parentElement.dataset.filename );
else
if( self.config.isDocroot )
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, e.target.parentElement.parentElement.dataset.filename ) );
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, ifmitem.parentElement.parentElement.dataset.filename ) );
else
document.forms["d_"+e.target.id].submit();
document.forms["d_"+ifmitem.id].submit();
} else if( e.target.parentElement.name == 'start_download' ) {
e.stopPropagation();
e.preventDefault();

11
ifm.php
View File

@@ -1332,16 +1332,17 @@ function IFM( params ) {
filetable.tBodies[0].addEventListener( 'click', function( e ) {
if( e.target.tagName == "TD" && e.target.parentElement.classList.contains( 'clickable-row' ) && e.target.parentElement.dataset.filename !== ".." && e.ctrlKey )
e.target.parentElement.classList.toggle( 'selectedItem' );
else if( e.target.classList.contains( 'ifmitem' ) ) {
else if( e.target.classList.contains( 'ifmitem' ) || e.target.parentElement.classList.contains( 'ifmitem' ) ) {
e.stopPropagation();
e.preventDefault();
if( e.target.dataset.type == "dir" )
self.changeDirectory( e.target.parentElement.parentElement.dataset.filename );
ifmitem = ( e.target.classList.contains( 'ifmitem' ) ? e.target : e.target.parentElement );
if( ifmitem.dataset.type == "dir" )
self.changeDirectory( ifmitem.parentElement.parentElement.dataset.filename );
else
if( self.config.isDocroot )
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, e.target.parentElement.parentElement.dataset.filename ) );
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, ifmitem.parentElement.parentElement.dataset.filename ) );
else
document.forms["d_"+e.target.id].submit();
document.forms["d_"+ifmitem.id].submit();
} else if( e.target.parentElement.name == 'start_download' ) {
e.stopPropagation();
e.preventDefault();

View File

@@ -180,16 +180,17 @@ function IFM( params ) {
filetable.tBodies[0].addEventListener( 'click', function( e ) {
if( e.target.tagName == "TD" && e.target.parentElement.classList.contains( 'clickable-row' ) && e.target.parentElement.dataset.filename !== ".." && e.ctrlKey )
e.target.parentElement.classList.toggle( 'selectedItem' );
else if( e.target.classList.contains( 'ifmitem' ) ) {
else if( e.target.classList.contains( 'ifmitem' ) || e.target.parentElement.classList.contains( 'ifmitem' ) ) {
e.stopPropagation();
e.preventDefault();
if( e.target.dataset.type == "dir" )
self.changeDirectory( e.target.parentElement.parentElement.dataset.filename );
ifmitem = ( e.target.classList.contains( 'ifmitem' ) ? e.target : e.target.parentElement );
if( ifmitem.dataset.type == "dir" )
self.changeDirectory( ifmitem.parentElement.parentElement.dataset.filename );
else
if( self.config.isDocroot )
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, e.target.parentElement.parentElement.dataset.filename ) );
window.location.href = self.hrefEncode( self.pathCombine( self.currentDir, ifmitem.parentElement.parentElement.dataset.filename ) );
else
document.forms["d_"+e.target.id].submit();
document.forms["d_"+ifmitem.id].submit();
} else if( e.target.parentElement.name == 'start_download' ) {
e.stopPropagation();
e.preventDefault();