mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix js tests

This commit is contained in:
Jörn Friedrich Dreyer 2014-12-31 14:36:48 +01:00
parent 8abd954d9a
commit b45d0f03fc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/files/js/filesummary.js
View File

@ -49,7 +49,7 @@
* @param update whether to update the display * @param update whether to update the display
*/ */
add: function(file, update) { add: function(file, update) {
if (file.name.toLowerCase().indexOf(this.summary.filter) === -1) { if (file.name && file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
return; return;
} }
if (file.type === 'dir' || file.mime === 'httpd/unix-directory') { if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
@ -69,7 +69,7 @@
* @param update whether to update the display * @param update whether to update the display
*/ */
remove: function(file, update) { remove: function(file, update) {
if (file.name.toLowerCase().indexOf(this.summary.filter) === -1) { if (file.name && file.name.toLowerCase().indexOf(this.summary.filter) === -1) {
return; return;
} }
if (file.type === 'dir' || file.mime === 'httpd/unix-directory') { if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
@ -133,6 +133,9 @@
*/ */
setSummary: function(summary) { setSummary: function(summary) {
this.summary = summary; this.summary = summary;
if (typeof this.summary.filter === 'undefined') {
this.summary.filter = '';
}
this.update(); this.update();
}, },
@ -157,7 +160,6 @@
// Substitute old content with new translations // Substitute old content with new translations
$dirInfo.html(n('files', '%n folder', '%n folders', this.summary.totalDirs)); $dirInfo.html(n('files', '%n folder', '%n folders', this.summary.totalDirs));
$fileInfo.html(n('files', '%n file', '%n files', this.summary.totalFiles)); $fileInfo.html(n('files', '%n file', '%n files', this.summary.totalFiles));
$filterInfo.html(n('files', 'matches \'{filter}\'', 'match \'{filter}\'', this.summary.totalDirs + this.summary.totalFiles, {filter: this.summary.filter}));
this.$el.find('.filesize').html(OC.Util.humanFileSize(this.summary.totalSize)); this.$el.find('.filesize').html(OC.Util.humanFileSize(this.summary.totalSize));
// Show only what's necessary (may be hidden) // Show only what's necessary (may be hidden)
@ -177,8 +179,10 @@
$connector.removeClass('hidden'); $connector.removeClass('hidden');
} }
if (this.summary.filter === '') { if (this.summary.filter === '') {
$filterInfo.html('');
$filterInfo.addClass('hidden'); $filterInfo.addClass('hidden');
} else { } else {
$filterInfo.html(n('files', ' matches \'{filter}\'', ' match \'{filter}\'', this.summary.totalDirs + this.summary.totalFiles, {filter: this.summary.filter}));
$filterInfo.removeClass('hidden'); $filterInfo.removeClass('hidden');
} }
}, },
@ -190,7 +194,11 @@
var summary = this.summary; var summary = this.summary;
var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs); var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs);
var fileInfo = n('files', '%n file', '%n files', summary.totalFiles); var fileInfo = n('files', '%n file', '%n files', summary.totalFiles);
var filterInfo = n('files', 'matches \'{filter}\'', 'match \'{filter}\'', summary.totalFiles + summary.totalDirs, {filter: summary.filter}) if (this.summary.filter === '') {
var filterInfo = '';
} else {
var filterInfo = n('files', ' matches \'{filter}\'', ' match \'{filter}\'', summary.totalFiles + summary.totalDirs, {filter: summary.filter});
}
var infoVars = { var infoVars = {
dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">', dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
@ -205,14 +213,11 @@
var info = t('files', '{dirs} and {files}', infoVars); var info = t('files', '{dirs} and {files}', infoVars);
var $summary = $('<td><span class="info">'+info+' <span class="filter">'+filterInfo+'</span></span></td>'+fileSize+'<td class="date"></td>'); var $summary = $('<td><span class="info">'+info+'<span class="filter">'+filterInfo+'</span></span></td>'+fileSize+'<td class="date"></td>');
if (!this.summary.totalFiles && !this.summary.totalDirs) { if (!this.summary.totalFiles && !this.summary.totalDirs) {
this.$el.addClass('hidden'); this.$el.addClass('hidden');
} }
if (!summary.filter) {
$summary.find('.filter').addClass('hidden');
}
this.$el.append($summary); this.$el.append($summary);
} }