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

File Manager update

Browse source
This commit is contained in:
Serghey Rodin 2015-09-29 14:25:28 +03:00
commit 687f36688a
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
web/js/file_manager.js
View file

@ -339,7 +339,6 @@ FM.updateTopLevelPathBar = function(box, tab, path) {
if (part.trim() == '') { if (part.trim() == '') {
return; return;
} }
console.log("part - " + part);
formattedPath.push('<a href="javascript:void(0)" onClick="FM.open(\''+part+'\', \''+box+'\')">'+part+'</span>'); formattedPath.push('<a href="javascript:void(0)" onClick="FM.open(\''+part+'\', \''+box+'\')">'+part+'</span>');
}); });
@ -1043,9 +1042,12 @@ FM.itemIsArchieve = function(item) {
FM.unpackItem = function() { FM.unpackItem = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab]; var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); var selected = $(FM['TAB_' + tab] ).find('.dir.active');
if (selected.length == 0) { if (selected.length == 0) {
return alert('No file selected'); //return alert('No file selected');
return FM.displayError(
App.Constants.FM_NO_FILE_SELECTED
);
} }
@ -1078,7 +1080,7 @@ FM.unpackItem = function() {
FM.packItem = function() { FM.packItem = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab]; var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); var selected = $(FM['TAB_' + tab] ).find('.dir.active');
if (selected.length == 0) { if (selected.length == 0) {
return FM.displayError( return FM.displayError(
App.Constants.FM_NO_FILE_SELECTED App.Constants.FM_NO_FILE_SELECTED
@ -1206,7 +1208,7 @@ FM.confirmRename = function() {
FM.renameItems = function() { FM.renameItems = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); var selected = $(FM['TAB_' + tab] ).find('.dir.active');
if (selected.length == 0) { if (selected.length == 0) {
return FM.displayError( return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
@ -1440,7 +1442,7 @@ FM.confirmCopyItems = function () {
FM.downloadFiles = function() { FM.downloadFiles = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
var selected = $(FM['TAB_' + tab] ).find('.dir.selected'); var selected = $(FM['TAB_' + tab] ).find('.dir.active');
if (!selected) { if (!selected) {
return FM.displayError( return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
@ -1451,7 +1453,10 @@ FM.downloadFiles = function() {
src = $.parseJSON(src); src = $.parseJSON(src);
if (FM.isItemPseudo(src) || FM.isItemDir(src)) { if (FM.isItemPseudo(src) || FM.isItemDir(src)) {
alert('Folder downloads are in progress atm'); //alert('Folder downloads are in progress atm');
return FM.displayError(
App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY
);
} }
if (FM.isItemPseudo(src)) { if (FM.isItemPseudo(src)) {
@ -1769,6 +1774,8 @@ $(document).ready(function() {
shortcut.add("Esc",function() { shortcut.add("Esc",function() {
FM.Env.RELOAD_IN_TIME = false;
$('#reload-in-time').remove();
if (FM.isPopupOpened()) { if (FM.isPopupOpened()) {
return FM.handlePopupCancel(); return FM.handlePopupCancel();
} }

1
web/js/i18n.js.php
View file

@ -52,6 +52,7 @@ App.Constants.FM_FILE_NAME_CANNOT_BE_EMPTY = '<?php echo __('File name cann
App.Constants.FM_NO_FILE_SELECTED = '<?php echo __('No file selected') ?>'; App.Constants.FM_NO_FILE_SELECTED = '<?php echo __('No file selected') ?>';
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = '<?php echo __('No file or folder selected') ?>'; App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED = '<?php echo __('No file or folder selected') ?>';
App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = '<?php echo __('File type not supported') ?>'; App.Constants.FM_FILE_TYPE_NOT_SUPPORTED = '<?php echo __('File type not supported') ?>';
App.Constants.FM_DIRECTORY_DOWNLOAD_NOT_READY = '<?php echo __('Directory download not available in current version') ?>';
App.Constants.FM_DIRECTORY_NOT_AVAILABLE = '<?php echo __('Directory not available') ?>'; App.Constants.FM_DIRECTORY_NOT_AVAILABLE = '<?php echo __('Directory not available') ?>';
App.Constants.FM_DONE = '<?php echo __('Done') ?>'; App.Constants.FM_DONE = '<?php echo __('Done') ?>';

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

@ -449,23 +449,27 @@
$(".listing-left").selectable({ $(".listing-left").selectable({
selected: function (event, ui) { selected: function (event, ui) {
FM.setTabActive(FM.TAB_A, 'skip_highlights'); FM.setTabActive(FM.TAB_A, 'skip_highlights');
$(".listing-left .selected").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');
$(o).removeClass('active');
} }
}); });
$(ui.selected).addClass('selected'); $(ui.selected).addClass('selected');
$(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").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');
$(o).removeClass('active');
} }
}); });
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');
} }
}); });
$(".listing-right").selectable({ $(".listing-right").selectable({