github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-15 01:23:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hotkeys for filemanager

Browse source
This commit is contained in:
Serghey Rodin 2015-09-29 22:24:22 +03:00
parent 51125fc904
commit a320b1f32c
2 changed files with 143 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

68
web/js/file_manager.js
View file

@ -292,6 +292,32 @@ FM.goDown = function() {
FM.setActive(index, FM.CURRENT_TAB); FM.setActive(index, FM.CURRENT_TAB);
} }
// reloads provided tab
// reloads opposite tab if its needed
FM.openAndSync = function(dir, box, callback) {
var tab = FM.getTabLetter(box);
var opposite_tab = 'A';
if (tab == 'A') {
opposite_tab = 'B';
}
var oppositeSyncNeeded = false;
if (FM.TAB_A_CURRENT_PATH == FM.TAB_B_CURRENT_PATH) {
oppositeSyncNeeded = true;
}
if (oppositeSyncNeeded) {
FM.open(dir, FM['TAB_' + opposite_tab], callback);
return FM.open(dir, box, callback);
}
else {
return FM.open(dir, box, callback);
}
}
FM.open = function(dir, box, callback) { FM.open = function(dir, box, callback) {
var tab = FM.getTabLetter(box); var tab = FM.getTabLetter(box);
@ -662,7 +688,14 @@ FM.generate_listing = function(reply, box) {
$(box).html(acc.done()); $(box).html(acc.done());
FM['CURRENT_'+tab+'_LINE'] = -1; ////////
/*if (FM['CURRENT_'+tab+'_LINE'] > -1 && $(box).find('.dir:eq(' + FM['CURRENT_'+tab+'_LINE'] + ')').lrngth > 0) {
}
else {
FM['CURRENT_'+tab+'_LINE'] = -1;
}*/
FM['CURRENT_'+tab+'_LINE'] = -1;
} }
FM.toggleCheck = function(uid) { FM.toggleCheck = function(uid) {
@ -1111,7 +1144,7 @@ FM.packItem = function() {
var tpl = Tpl.get('popup_pack', 'FM'); var tpl = Tpl.get('popup_pack', 'FM');
tpl.set(':FILENAME', src.name); tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', dst + '/' + src.name + '_packed.tar.gz'); tpl.set(':DST_DIRNAME', dst + '/' + src.name + '.tar.gz');
FM.popupOpen(tpl.finalize()); FM.popupOpen(tpl.finalize());
} }
@ -1198,7 +1231,7 @@ FM.confirmRename = function() {
App.Ajax.request(action, params, function(reply) { App.Ajax.request(action, params, function(reply) {
if (reply.result == true) { if (reply.result == true) {
FM.popupClose(); FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
} }
else { else {
FM.showError('rename-items', reply.message); FM.showError('rename-items', reply.message);
@ -1235,6 +1268,7 @@ FM.isPopupOpened = function() {
} }
FM.popupOpen = function(html) { FM.popupOpen = function(html) {
FM.popupClose();
//$('#popup').flayer_close(); //$('#popup').flayer_close();
$('<div>').attr('id', 'popup').html(html).flayer({ $('<div>').attr('id', 'popup').html(html).flayer({
afterStart: function(elm) { afterStart: function(elm) {
@ -1432,7 +1466,7 @@ FM.confirmCopyItems = function () {
if (reply.result == true) { if (reply.result == true) {
FM.popupClose(); FM.popupClose();
// FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]); // FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]); FM.openAndSync(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
} }
else { else {
FM.showError('copy-items', reply.message); FM.showError('copy-items', reply.message);
@ -1504,7 +1538,7 @@ FM.confirmDelete = function() {
App.Ajax.request('delete_files', params, function(reply) { App.Ajax.request('delete_files', params, function(reply) {
if (reply.result == true) { if (reply.result == true) {
FM.popupClose(); FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
} }
else { else {
FM.showError('delete-items', reply.message); FM.showError('delete-items', reply.message);
@ -1611,7 +1645,7 @@ FM.confirmCreateDir = function() {
App.Ajax.request('create_dir', params, function(reply) { App.Ajax.request('create_dir', params, function(reply) {
if (reply.result == true) { if (reply.result == true) {
FM.popupClose(); FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
} }
else { else {
FM.showError('create-dir', reply.message); FM.showError('create-dir', reply.message);
@ -1646,7 +1680,7 @@ FM.confirmCreateFile = function() {
App.Ajax.request('create_file', params, function(reply) { App.Ajax.request('create_file', params, function(reply) {
if (reply.result == true) { if (reply.result == true) {
FM.popupClose(); FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
} }
else { else {
FM.showError('create-file', reply.message); FM.showError('create-file', reply.message);
@ -1948,6 +1982,7 @@ $(document).ready(function() {
'disable_in_input': true, 'disable_in_input': true,
'target': document 'target': document
}); });
shortcut.add("shift+F6",function() { shortcut.add("shift+F6",function() {
FM.renameItems(); FM.renameItems();
},{ },{
@ -1988,14 +2023,7 @@ $(document).ready(function() {
'target': document 'target': document
}); });
shortcut.add("u",function() {
/// TODO upload file FM.uploadFile();
},{
'type': 'keydown',
'propagate': false,
'disable_in_input': true,
'target': document
});
shortcut.add("d",function() { shortcut.add("d",function() {
FM.downloadFiles(); FM.downloadFiles();
@ -2025,7 +2053,15 @@ $(document).ready(function() {
});*/ });*/
shortcut.add("u",function() {
var tab_letter = FM.getTabLetter(FM.CURRENT_TAB);
$('#file_upload_'+tab_letter).trigger('click');
},{
'type': 'keydown',
'propagate': false,
'disable_in_input': true,
'target': document
});
/* is jQuery .live() has been removed in version 1.9 onwards /* is jQuery .live() has been removed in version 1.9 onwards

100
web/templates/file_manager/main.php
View file

@ -380,16 +380,16 @@
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab]; var box = FM['TAB_' + tab];
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], box); FM.openAndSync(FM['TAB_' + tab + '_CURRENT_PATH'], box);
//$('.file-upload-button-' + tab).removeClass('progress'); //$('.file-upload-button-' + tab).removeClass('progress');
$('.file-upload-button-' + tab).addClass('done'); $('.file-upload-button-' + tab).addClass('done');
setTimeout(function() { setTimeout(function() {
$('.file-upload-button-' + tab).removeClass('progress'); $('.file-upload-button-' + tab).removeClass('progress');
$('.file-upload-button-' + tab).removeClass('done'); $('.file-upload-button-' + tab).removeClass('done');
}, 2000); }, 2000);
$('.file-upload-button-' + tab).css('background-position', '-96px 0'); $('.file-upload-button-' + tab).css('background-position', '-96px 0');
}, },
progressall: function (e, data) { progressall: function (e, data) {
@ -448,7 +448,34 @@
$(".listing-left").selectable({ $(".listing-left").selectable({
selected: function (event, ui) { selected: function (event, ui) {
FM.setTabActive(FM.TAB_A, 'skip_highlights'); //console.log(ui);
//console.log($(".listing-left .selected"));
FM.setTabActive(FM.TAB_A, 'skip_highlights');
$(".listing-left .active").removeClass('active');
$(".listing-left .selected").each(function(i, o) {
if (!$(o).hasClass('ui-selected')) {
$(o).removeClass('selected');
$(o).removeClass('active');
}
});
$(ui.selected).addClass('selected');
$(ui.selected).addClass('active');
//$(ui.selected).addClass('active');
checkIfArchive(ui.selected);
$(".listing-left .ui-selected").addClass('selected');
if ($(".listing-left .active").length > 0) {
FM['CURRENT_A_LINE'] = $(".listing-left .active").index();
}
else {
FM['CURRENT_A_LINE'] = 0;
}
/*FM.setTabActive(FM.TAB_A, 'skip_highlights');
$(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { $(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) {
if (!$(o).hasClass('ui-selected')) { if (!$(o).hasClass('ui-selected')) {
$(o).removeClass('selected'); $(o).removeClass('selected');
@ -458,10 +485,22 @@
$(ui.selected).addClass('selected'); $(ui.selected).addClass('selected');
$(ui.selected).addClass('active'); $(ui.selected).addClass('active');
checkIfArchive(ui.selected); checkIfArchive(ui.selected);
$(".listing-left .ui-selected").addClass('selected'); $(".listing-left .ui-selected").addClass('selected');*/
}, },
unselected: function (event, ui) { unselected: function (event, ui) {
$(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) { FM.setTabActive(FM.TAB_A, 'skip_highlights');
$(ui.unselected).removeClass('selected');
$(ui.unselected).removeClass('active');
if ($(".listing-left .active").length > 0) {
FM['CURRENT_A_LINE'] = $(".listing-left .active").index();
}
else {
FM['CURRENT_A_LINE'] = 0;
}
/*$(".listing-left .selected, .listing-left .ui-selectee").each(function(i, o) {
if (!$(o).hasClass('ui-selected')) { if (!$(o).hasClass('ui-selected')) {
$(o).removeClass('selected'); $(o).removeClass('selected');
$(o).removeClass('active'); $(o).removeClass('active');
@ -469,10 +508,53 @@
}); });
FM.setTabActive(FM.TAB_A, 'skip_highlights'); FM.setTabActive(FM.TAB_A, 'skip_highlights');
$(ui.unselected).removeClass('selected'); $(ui.unselected).removeClass('selected');
$(ui.selected).addClass('active'); $(ui.selected).addClass('active');*/
} }
}); });
$(".listing-right").selectable({ $(".listing-right").selectable({
selected: function (event, ui) {
FM.setTabActive(FM.TAB_B, 'skip_highlights');
$(".listing-right .active").removeClass('active');
$(".listing-right .selected").each(function(i, o) {
if (!$(o).hasClass('ui-selected')) {
$(o).removeClass('selected');
$(o).removeClass('active');
}
});
$(ui.selected).addClass('selected');
$(ui.selected).addClass('active');
//$(ui.selected).addClass('active');
checkIfArchive(ui.selected);
$(".listing-right .ui-selected").addClass('selected');
if ($(".listing-right .active").length > 0) {
FM['CURRENT_B_LINE'] = $(".listing-right .active").index();
}
else {
FM['CURRENT_B_LINE'] = 0;
}
},
unselected: function (event, ui) {
FM.setTabActive(FM.TAB_B, 'skip_highlights');
$(ui.unselected).removeClass('selected');
$(ui.unselected).removeClass('active');
if ($(".listing-right .active").length > 0) {
FM['CURRENT_B_LINE'] = $(".listing-right .active").index();
}
else {
FM['CURRENT_B_LINE'] = 0;
}
}
});
/*$(".listing-right").selectable({
selected: function (event, ui) { selected: function (event, ui) {
$(".listing-left .selected").each(function(i, o) { $(".listing-left .selected").each(function(i, o) {
if (!$(o).hasClass('ui-selected')) { if (!$(o).hasClass('ui-selected')) {
@ -493,7 +575,7 @@
FM.setTabActive(FM.TAB_B, 'skip_highlights'); FM.setTabActive(FM.TAB_B, 'skip_highlights');
$(ui.unselected).removeClass('selected'); $(ui.unselected).removeClass('selected');
} }
}); });*/
}); });