diff --git a/.gitattributes b/.gitattributes index 81b9ee2..9b00969 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,5 +5,5 @@ src/includes/ace.js -diff src export-ignore compiler.php export-ignore -.gitignore export-ignore +.gitignore export-ignore .gitattributes export-ignore diff --git a/compiler.php b/compiler.php index 491c0fa..7b71dba 100755 --- a/compiler.php +++ b/compiler.php @@ -10,7 +10,7 @@ chdir( realpath( dirname( __FILE__ ) ) ); // output files and common attrs define( "IFM_CDN", true ); -define( "IFM_VERSION", "v2.6.0" ); +define( "IFM_VERSION", "v2.6.1" ); define( "IFM_RELEASE_DIR", "dist/"); define( "IFM_STANDALONE", "ifm.php" ); define( "IFM_STANDALONE_GZ", "ifm.min.php" ); diff --git a/src/ifm.js b/src/ifm.js index 0e02139..04f4ac7 100644 --- a/src/ifm.js +++ b/src/ifm.js @@ -520,8 +520,8 @@ function IFM(params) { self.editor.getSession().setMode( e.target.value ); }); }); - return $(content); + } }); @@ -1132,7 +1132,7 @@ function IFM(params) { searchresults.tBodies[0].addEventListener( 'click', function( e ) { if( e.target.classList.contains( 'searchitem' ) || e.target.parentElement.classList.contains( 'searchitem' ) ) { 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(); } }); diff --git a/src/style.css b/src/style.css index 740762a..3f39fb3 100644 --- a/src/style.css +++ b/src/style.css @@ -1,5 +1,6 @@ body { padding-top: 70px; + overflow-y: scroll !important; } .icon { font-size: 14pt; diff --git a/src/templates/app.html b/src/templates/app.html index fa9e5fb..962a579 100644 --- a/src/templates/app.html +++ b/src/templates/app.html @@ -19,12 +19,16 @@