Add different formatting for linked files when they're in sub-directories

- Fix bug in formatting if first link is in a subdirectory
This commit is contained in:
Nathan Gray 2015-09-09 14:45:37 +00:00
parent 48c3a39b0e
commit a44661fc52

View File

@ -1971,14 +1971,14 @@ var et2_link_list = et2_link_string.extend(
$td.attr('data-title', _link_data['title']); $td.attr('data-title', _link_data['title']);
// VFS link - check for same dir as above, and hide dir // VFS link - check for same dir as above, and hide dir
var reformat = false;
var span_size = 0.3;
var prev = $j('td.title',$td.parent().prev('tr')); var prev = $j('td.title',$td.parent().prev('tr'));
if(prev.length === 1) if(prev.length === 1)
{ {
var prev_dirs = (prev.attr('data-title') || '').split('/'); var prev_dirs = (prev.attr('data-title') || '').split('/');
var reformat = false;
if(prev_dirs.length > 1 && prev_dirs.length == dirs.length) if(prev_dirs.length > 1 && prev_dirs.length == dirs.length)
{ {
var span_size = 0.3;
for(var i = 0; i < dirs.length; i++) for(var i = 0; i < dirs.length; i++)
{ {
// Current is same as prev, blank it // Current is same as prev, blank it
@ -1994,16 +1994,17 @@ var et2_link_list = et2_link_string.extend(
} }
} }
} }
if(reformat) }
{ if(reformat)
$td.html('<span style="display: inline-block; width:'+span_size+'ex;"></span>&nbsp;- '+dirs.join('')); {
} $td.html('<span style="display: inline-block; width:'+span_size+'ex;"></span> - '+dirs.join(''));
else }
{ else
// Different format for directory {
var filename = dirs.pop(); // Different format for directory
$td.text(dirs.join('/') + ': - ' + filename); var filename = dirs.pop();
} span_size += dirs.join('/').length+1;
$td.html('<span style="display: inline-block; width:'+span_size+'ex;">'+dirs.join('/')+':</span> - ' + filename);
} }
} }
}); });