1
0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-10 01:56:30 +02:00

merge original project modifications

This commit is contained in:
Anton Baranov
2020-06-06 07:45:29 +03:00
committed by Marco Dickert
parent 40aebb172e
commit 3052e2c2ef
5 changed files with 9 additions and 4 deletions

2
.gitattributes vendored
View File

@@ -5,5 +5,5 @@ src/includes/ace.js -diff
src export-ignore src export-ignore
compiler.php export-ignore compiler.php export-ignore
.gitignore export-ignore .gitignore export-ignore
.gitattributes export-ignore .gitattributes export-ignore

View File

@@ -10,7 +10,7 @@ chdir( realpath( dirname( __FILE__ ) ) );
// output files and common attrs // output files and common attrs
define( "IFM_CDN", true ); define( "IFM_CDN", true );
define( "IFM_VERSION", "<a href='https://github.com/cryol/ifm/tree/2.6.0' target=_blank>v2.6.0</a>" ); define( "IFM_VERSION", "<a href='https://github.com/cryol/ifm/tree/2.6.1' target=_blank>v2.6.1</a>" );
define( "IFM_RELEASE_DIR", "dist/"); define( "IFM_RELEASE_DIR", "dist/");
define( "IFM_STANDALONE", "ifm.php" ); define( "IFM_STANDALONE", "ifm.php" );
define( "IFM_STANDALONE_GZ", "ifm.min.php" ); define( "IFM_STANDALONE_GZ", "ifm.min.php" );

View File

@@ -520,8 +520,8 @@ function IFM(params) {
self.editor.getSession().setMode( e.target.value ); self.editor.getSession().setMode( e.target.value );
}); });
}); });
return $(content); return $(content);
} }
}); });
@@ -1132,7 +1132,7 @@ function IFM(params) {
searchresults.tBodies[0].addEventListener( 'click', function( e ) { searchresults.tBodies[0].addEventListener( 'click', function( e ) {
if( e.target.classList.contains( 'searchitem' ) || e.target.parentElement.classList.contains( 'searchitem' ) ) { if( e.target.classList.contains( 'searchitem' ) || e.target.parentElement.classList.contains( 'searchitem' ) ) {
e.preventDefault(); e.preventDefault();
self.changeDirectory(self.pathCombine(self.search.data.currentDir, e.target.dataset.folder || e.target.parentElement.dataset.folder), {absolute: true}); self.changeDirectory( self.pathCombine( self.search.data.currentDir, e.target.dataset.folder || e.target.parentElement.dataset.folder ), { absolute: true });
self.hideModal(); self.hideModal();
} }
}); });

View File

@@ -1,5 +1,6 @@
body { body {
padding-top: 70px; padding-top: 70px;
overflow-y: scroll !important;
} }
.icon { .icon {
font-size: 14pt; font-size: 14pt;

View File

@@ -19,12 +19,16 @@
</form> </form>
</div> </div>
<ul class="navbar-nav"> <ul class="navbar-nav">
{{#config.showrefresh}}
<li class="nav-item active"> <li class="nav-item active">
<a id="refresh" class="nav-link"><span title="{{i18n.refresh}}" class="icon icon-arrows-cw" href="#"></span> <span class="d-block d-sm-none">{{i18n.refresh}}</span></a> <a id="refresh" class="nav-link"><span title="{{i18n.refresh}}" class="icon icon-arrows-cw" href="#"></span> <span class="d-block d-sm-none">{{i18n.refresh}}</span></a>
</li> </li>
{{/config.showrefresh}}
{{#config.search}}
<li class="nav-item"> <li class="nav-item">
<a id="search" class="nav-link"><span title="{{i18n.search}}" class="icon icon-search" href="#"></span> <span class="d-block d-sm-none">{{i18n.search}}</span></a> <a id="search" class="nav-link"><span title="{{i18n.search}}" class="icon icon-search" href="#"></span> <span class="d-block d-sm-none">{{i18n.search}}</span></a>
</li> </li>
{{/config.search}}
{{#config.upload}} {{#config.upload}}
<li class="nav-item"> <li class="nav-item">
<a id="upload" class="nav-link"><span title="{{i18n.upload}}" class="icon icon-upload" href="#"></span> <span class="d-block d-sm-none">{{i18n.upload}}</span></a> <a id="upload" class="nav-link"><span title="{{i18n.upload}}" class="icon icon-upload" href="#"></span> <span class="d-block d-sm-none">{{i18n.upload}}</span></a>