github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-06 04:51:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

filemanager improvements

Browse source
This commit is contained in:
Serghey Rodin 2016-08-25 19:33:06 +03:00
parent 03381b828f
commit 136cc17873
32 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
web/js/file_manager.js
View file

@ -651,10 +651,13 @@ FM.generate_listing = function(reply, box) {
var t_index = tab + '_' + i;
o.name = o.name.replace('"', '\"');
o.full_path = o.full_path.replace('"', '\"');
var tpl = Tpl.get('entry_line', 'FM');
tpl.set(':CL_ACTION_1', cl_act);
tpl.set(':SOURCE', $.toJSON(o));
tpl.set(':NAME', o.name);
tpl.set(':SOURCE', $.toJSON(o));
tpl.set(':PERMISSIONS', o.permissions);
tpl.set(':OWNER', o.owner);
tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : ' ');
@ -1265,15 +1268,15 @@ FM.confirmRename = function() {
var src = selected.find('.source').val();
src = $.parseJSON(src);
var target_name = $('#rename-title').val();
if (target_name.trim().length == 0) {
return FM.displayError(
App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY
);
}
var action = FM.isItemFile(src) ? 'rename_file' : 'rename_directory';
var params = {
@ -1281,7 +1284,7 @@ FM.confirmRename = function() {
target_name: target_name,
dir: FM['TAB_' + tab + '_CURRENT_PATH'] + '/'
};
App.Ajax.request(action, params, function(reply) {
if (reply.result == true) {
FM.popupClose();
@ -1842,7 +1845,6 @@ FM.confirmUnpackItem = function () {
}
FM.confirmPackItem = function () {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.active, .dir.selected');
@ -1857,13 +1859,12 @@ FM.confirmPackItem = function () {
src = $.parseJSON(src);
if (FM.isItemPseudo(src)) {
return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
);
}
return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
);
}
}
if (selected.length > 0) {
var files_arr = [];
$.each(selected, function(i, o) {
@ -1898,7 +1899,6 @@ FM.confirmPackItem = function () {
if (reply.result == true) {
FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
/// FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
}
else {
FM.showError('unpack_item', reply.message);

4
web/js/init.js
View file

@ -548,6 +548,10 @@ $(document).ready(function(){
VE.navigation.init();
$('.button').attr('title','ctrl+Enter');
$('.button.cancel').attr('title','ctrl+Backspace');
VE.core.register();
if (location.href.search(/list/) != -1) {
var shift_select_ref = $('body').finderSelect({