mirror/php-ifm
1
0
Fork 0
mirror of https://github.com/misterunknown/ifm.git synced 2025-08-09 17:46:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'v4-fixes/v4-fixes' into v4-fixes

Browse Source
This commit is contained in:
Dmitriy Novash
2021-11-25 13:53:55 +02:00
parent f331f8ed04 5eb817f592
commit ff4d4a5a80
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ifm.js
View File

@@ -629,7 +629,7 @@ function IFM(params) {
if( data.status == "OK" ) {
self.showMessage( self.i18n.file_save_success, "s" );
self.refreshFileTable();
} else self.showMessage( self.i18n.file_save_error + data.message, "e" );
} else self.showMessage( data.message, "e" );
},
error: function() { self.showMessage( self.i18n.general_error, "e" ); }
});
@@ -658,7 +658,7 @@ function IFM(params) {
else if( data.status == "OK" && data.data.content == null ) {
self.showMessage( self.i18n.file_load_error, "e" );
}
else self.showMessage( self.i18n.error +data.message, "e" );
else self.showMessage( data.message, "e" );
},
error: function() { self.showMessage( self.i18n.file_display_error, "e" ); }
});
@@ -708,7 +708,7 @@ function IFM(params) {
self.refreshFileTable();
}
else {
self.showMessage( self.i18n.folder_create_error +data.message, "e" );
self.showMessage( data.message, "e" );
}
},
error: function() { self.showMessage( self.i18n.general_error, "e" ); }
@@ -812,7 +812,7 @@ function IFM(params) {
if(data.status == "OK") {
ifm.showMessage( self.i18n.file_rename_success, "s");
ifm.refreshFileTable();
} else ifm.showMessage( self.i18n.file_rename_error +data.message, "e");
} else ifm.showMessage( data.message, "e");
},
error: function() { ifm.showMessage( self.i18n.general_error, "e"); }
});
@@ -836,9 +836,8 @@ function IFM(params) {
$( '#copyMoveTree' ).treeview({
data: data,
levels: 1,
expandIcon: "icon icon-folder-empty",
emptyIcon: "icon icon-folder-empty",
collapseIcon: "icon icon-folder-open-empty",
expandIcon: "icon icon-plus-squared",
collapseIcon: "icon icon-minus-squared-alt",
loadingIcon: "icon icon-spin5",
lazyLoad: function( n, cb ) {
$.ajax({
@@ -1154,7 +1153,7 @@ function IFM(params) {
self.showMessage( self.i18n.file_upload_success, "s" );
self.refreshFileTable();
} else
self.showMessage( self.i18n.file_upload_error + data.message, "e" );
self.showMessage( data.message, "e" );
},
error: function() { self.showMessage( self.i18n.general_error, "e"); },
complete: function() { self.task_done(id); }
@@ -1244,7 +1243,7 @@ function IFM(params) {
self.showMessage( data.message, "e" );
} else {
data.forEach( function(e) {
e.folder = e.name.substr( 0, e.name.lastIndexOf( '/' ) );
e.folder = ( e.name.substr( 0, e.name.lastIndexOf( '/' ) ) ) ? e.name.substr( 0, e.name.lastIndexOf( '/' ) ) : '/';
e.linkname = e.name.substr( e.name.lastIndexOf( '/' ) + 1 );
});
self.search.data = data;
@@ -1339,10 +1338,16 @@ function IFM(params) {
*/
this.showMessage = function(m, t) {
let msgType = ( t == "e" ) ? "danger" : ( t == "s" ) ? "success" : "info";
let element = ( self.config.inline ) ? self.rootElement : "body";
let offsetY = ( document.activeElement.tagName == "BODY" ) ? 15 : 70;
$.notify(
{ message: m },
{ type: msgType, delay: 3000, mouse_over: 'pause', offset: { x: 15, y: 65 }, element: element }
{ type: msgType, delay: 3000, mouse_over: 'pause',
offset: { x: 0, y: offsetY },
placement: {
from: "bottom",
align: "right"
},
element: document.activeElement }
);
};

1
src/includes/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/includes/popper.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/templates/modal.file.html
View File

@@ -10,8 +10,7 @@
</fieldset>
</div>
<div class="modal-footer">
<button type="button" id="buttonSave" class="btn btn-primary">{{i18n.create}}</button>
<button type="button" id="buttonSaveNotClose" class="btn btn-success">{{i18n.create_wo_close}}</button>
<button type="button" id="buttonClose" class="btn btn-danger">{{i18n.cancel}}</button>
<button type="button" id="buttonSaveNotClose" class="btn btn-success">{{i18n.save}}</button>
<button type="button" id="buttonClose" class="btn btn-danger">{{i18n.close}}</button>
</div>
</form>

2
src/templates/modal.search.html
View File

@@ -2,7 +2,7 @@
<div class="modal-body">
<fieldset>
<div class="form-group">
<label for="searchPattern">{{i18n.search_pattern}}:</label>
<label for="searchPattern">{{i18n.search}}</label>
<input type="search" class="form-control" id="searchPattern" name="pattern" autocomplete="off" value="{{lastSearch}}">
</div>
<table id="searchResults" class="table">