github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-14 02:28:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for FM

Browse source
This commit is contained in:
Serghey Rodin 2015-10-28 16:39:39 +02:00
commit 5d070fc9a5
13 changed files with 274 additions and 1489 deletions
Download patch file Download diff file Expand all files Collapse all files

69
web/js/events.js
View file

@ -238,6 +238,7 @@ VE.navigation.enter_focused = function() {
}
}
/*
VE.navigation.move_focus_left = function(){
var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus')));
if(index == -1)
@ -248,6 +249,8 @@ VE.navigation.move_focus_left = function(){
} else {
$($(VE.navigation.state.menu_selector)[0]).addClass('focus');
}
}
VE.navigation.move_focus_right = function(){
@ -286,6 +289,71 @@ VE.navigation.switch_menu = function(){
$($(VE.navigation.state.menu_selector)[index]).addClass('focus');
}
}
*/
VE.navigation.move_focus_left = function(){
var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus')));
if(index == -1)
index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector)));
$(VE.navigation.state.menu_selector).removeClass('focus');
if(index > 0){
$($(VE.navigation.state.menu_selector)[index-1]).addClass('focus');
} else {
VE.navigation.switch_menu('last');
}
}
VE.navigation.move_focus_right = function(){
var max_index = $(VE.navigation.state.menu_selector).length-1;
var index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_selector+'.focus')));
if(index == -1)
index = parseInt($(VE.navigation.state.menu_selector).index($(VE.navigation.state.menu_active_selector))) || 0;
$(VE.navigation.state.menu_selector).removeClass('focus');
if(index < max_index){
$($(VE.navigation.state.menu_selector)[index+1]).addClass('focus');
} else {
VE.navigation.switch_menu('first');
}
}
VE.navigation.switch_menu = function(position){
position = position || 'first'; // last
if(VE.navigation.state.active_menu == 0){
VE.navigation.state.active_menu = 1;
VE.navigation.state.menu_selector = '.l-stat__col';
VE.navigation.state.menu_active_selector = '.l-stat__col--active';
$('.l-menu').removeClass('active');
$('.l-stat').addClass('active');
if(position == 'first'){
$($(VE.navigation.state.menu_selector)[0]).addClass('focus');
} else {
var max_index = $(VE.navigation.state.menu_selector).length-1;
$($(VE.navigation.state.menu_selector)[max_index]).addClass('focus');
}
} else {
VE.navigation.state.active_menu = 0;
VE.navigation.state.menu_selector = '.l-menu__item';
VE.navigation.state.menu_active_selector = '.l-menu__item--active';
$('.l-menu').addClass('active');
$('.l-stat').removeClass('active');
if(position == 'first'){
$($(VE.navigation.state.menu_selector)[0]).addClass('focus');
} else {
var max_index = $(VE.navigation.state.menu_selector).length-1;
$($(VE.navigation.state.menu_selector)[max_index]).addClass('focus');
}
}
}
VE.navigation.init = function(){
if($('.l-menu__item.l-menu__item--active').length){
@ -295,7 +363,6 @@ VE.navigation.init = function(){
VE.navigation.state.menu_active_selector = '.l-menu__item--active';
$('.l-menu').addClass('active');
$('.l-stat').removeClass('active');
} else {
$('.l-stat').addClass('active');
}

5
web/js/file_manager.js
View file

@ -663,9 +663,8 @@ FM.generate_listing = function(reply, box) {
tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : '&nbsp;');
tpl.set(':SIZE_UNIT', o.type == 'f' ? FM.humanFileSizeUnit(o.size) : '&nbsp;');
tpl.set(':TIME', (psDate.getFullYear() != new Date().getFullYear()) ? psDate.getFullYear() || "" : time);
tpl.set(':DATE', o.date.trim() != '' ? psDate.format('mmm d') : '&nbsp;'/*o.date*/);
tpl.set(':DATE', o.date.trim() != '' ? App.Constants.FM_TRANSLATED_DATES[psDate.format('mmm')] + psDate.format(' d'): '&nbsp;'/*o.date*/);
if (o.name == '..' || o.type == 'd') {
tpl.set(':SUBMENU_CLASS', 'hidden');
}

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

@ -83,6 +83,6 @@ App.Constants.FM_FILE = '<?=__('File')?>';
App.Constants.FM_ALREADY_EXISTS = '<?=__('already exists')?>';
App.Constants.FM_CREATE_FILE = '<?=__('Create file')?>';
App.Constants.FM_CREATE_DIRECTORY = '<?=__('Create directory')?>';
App.Constants.FM_TRANSLATED_DATES = {'Jan': '<?=__('Jan')?>', 'Feb': '<?=__('Feb')?>','Mar': '<?=__('Mar')?>','Apr': '<?=__('Apr')?>','May': '<?=__('May')?>','Jun': '<?=__('Jun')?>','Jul': '<?=__('Jul')?>','Aug': '<?=__('Aug')?>','Sep': '<?=__('Sep')?>','Oct': '<?=__('Oct')?>','Nov': '<?=__('Nov')?>','Dec': '<?=__('Dec')?>'};