From 9ddb1c969a3ef5c81134a71f2bb39c370d2ed575 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 6 Jan 2020 12:01:35 +0100 Subject: [PATCH] Recompile after last merge Signed-off-by: Marco Dickert --- build/libifm.php | 10 ++++++++-- ifm.php | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 9be5952..ffe6b20 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -1652,8 +1652,14 @@ function IFM( params ) { onClick: function( data ) { if( data.clicked.link.toLowerCase().substr(0,4) == "http" ) self.copyToClipboard( data.clicked.link ); - else - self.copyToClipboard( self.pathCombine( window.location.origin, data.clicked.link ) ); + else { + var pathname = window.location.pathname.replace( /^\/*/g, '' ).split( '/' ); + pathname.pop(); + var link = self.pathCombine( window.location.origin, data.clicked.link ) + if( pathname.length > 0 ) + link = self.pathCombine( window.location.origin, pathname.join( '/' ), data.clicked.link ) + self.copyToClipboard( link ); + } }, iconClass: "icon icon-link-ext", isShown: function( data ) { return !!( !data.selected.length && data.clicked.name != ".." ); } diff --git a/ifm.php b/ifm.php index 961e557..0718d80 100644 --- a/ifm.php +++ b/ifm.php @@ -1652,8 +1652,14 @@ function IFM( params ) { onClick: function( data ) { if( data.clicked.link.toLowerCase().substr(0,4) == "http" ) self.copyToClipboard( data.clicked.link ); - else - self.copyToClipboard( self.pathCombine( window.location.origin, data.clicked.link ) ); + else { + var pathname = window.location.pathname.replace( /^\/*/g, '' ).split( '/' ); + pathname.pop(); + var link = self.pathCombine( window.location.origin, data.clicked.link ) + if( pathname.length > 0 ) + link = self.pathCombine( window.location.origin, pathname.join( '/' ), data.clicked.link ) + self.copyToClipboard( link ); + } }, iconClass: "icon icon-link-ext", isShown: function( data ) { return !!( !data.selected.length && data.clicked.name != ".." ); }