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

fixing indent - sorryy wrong setting on the IDE :-( 

replace missing calls to OC.Notification.show
This commit is contained in:
Thomas Mueller 2013-01-11 15:02:34 +01:00
parent 9afdc14d40
commit 3d33e8f845
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/files/js/files.js
View File

@ -28,13 +28,11 @@ Files={
}, },
isFileNameValid:function (name) { isFileNameValid:function (name) {
if (name === '.') { if (name === '.') {
$('#notification').text(t('files', '\'.\' is an invalid file name.')); OC.Notification.show(t('files', '\'.\' is an invalid file name.'));
$('#notification').fadeIn();
return false; return false;
} }
if (name.length == 0) { if (name.length == 0) {
$('#notification').text(t('files', 'File name cannot be empty.')); OC.Notification.show(t('files', 'File name cannot be empty.'));
$('#notification').fadeIn();
return false; return false;
} }
@ -46,17 +44,17 @@ Files={
return false; return false;
} }
} }
OC.Notification.hide(); OC.Notification.hide();
return true; return true;
}, },
displayStorageWarnings: function() { displayStorageWarnings: function() {
var usedSpacePercent = $('#usedSpacePercent').val(); var usedSpacePercent = $('#usedSpacePercent').val();
if (usedSpacePercent > 98) { if (usedSpacePercent > 98) {
OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!')); OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
return; return;
} }
if (usedSpacePercent > 90) { if (usedSpacePercent > 90) {
OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent})); OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
} }
} }
}; };
@ -192,7 +190,7 @@ $(document).ready(function() {
$('.download').click('click',function(event) { $('.download').click('click',function(event) {
var files=getSelectedFiles('name').join(';'); var files=getSelectedFiles('name').join(';');
var dir=$('#dir').val()||'/'; var dir=$('#dir').val()||'/';
OC.Notification.show(t('files','generating ZIP-file, it may take some time.')); OC.Notification.show(t('files','generating ZIP-file, it may take some time.'));
// use special download URL if provided, e.g. for public shared files // use special download URL if provided, e.g. for public shared files
if ( (downloadURL = document.getElementById("downloadURL")) ) { if ( (downloadURL = document.getElementById("downloadURL")) ) {
window.location=downloadURL.value+"&download&files="+files; window.location=downloadURL.value+"&download&files="+files;
@ -360,7 +358,7 @@ $(document).ready(function() {
uploadtext.text(t('files', '{count} files uploading', {count: currentUploads})); uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
} }
delete uploadingFiles[dirName][fileName]; delete uploadingFiles[dirName][fileName];
OC.Notification.show(t('files', 'Upload cancelled.')); OC.Notification.show(t('files', 'Upload cancelled.'));
} }
}); });
//TODO test with filenames containing slashes //TODO test with filenames containing slashes
@ -385,7 +383,7 @@ $(document).ready(function() {
FileList.loadingDone(file.name, file.id); FileList.loadingDone(file.name, file.id);
} else { } else {
Files.cancelUpload(this.files[0].name); Files.cancelUpload(this.files[0].name);
OC.Notification.show(t('files', response.data.message)); OC.Notification.show(t('files', response.data.message));
$('#fileList > tr').not('[data-mime]').fadeOut(); $('#fileList > tr').not('[data-mime]').fadeOut();
$('#fileList > tr').not('[data-mime]').remove(); $('#fileList > tr').not('[data-mime]').remove();
} }
@ -393,7 +391,7 @@ $(document).ready(function() {
.error(function(jqXHR, textStatus, errorThrown) { .error(function(jqXHR, textStatus, errorThrown) {
if(errorThrown === 'abort') { if(errorThrown === 'abort') {
Files.cancelUpload(this.files[0].name); Files.cancelUpload(this.files[0].name);
OC.Notification.show(t('files', 'Upload cancelled.')); OC.Notification.show(t('files', 'Upload cancelled.'));
} }
}); });
uploadingFiles[uniqueName] = jqXHR; uploadingFiles[uniqueName] = jqXHR;
@ -415,7 +413,7 @@ $(document).ready(function() {
FileList.loadingDone(file.name, file.id); FileList.loadingDone(file.name, file.id);
} else { } else {
//TODO Files.cancelUpload(/*where do we get the filename*/); //TODO Files.cancelUpload(/*where do we get the filename*/);
OC.Notification.show(t('files', response.data.message)); OC.Notification.show(t('files', response.data.message));
$('#fileList > tr').not('[data-mime]').fadeOut(); $('#fileList > tr').not('[data-mime]').fadeOut();
$('#fileList > tr').not('[data-mime]').remove(); $('#fileList > tr').not('[data-mime]').remove();
} }
@ -541,7 +539,7 @@ $(document).ready(function() {
} else if (type != 'web' && !Files.isFileNameValid(newname)) { } else if (type != 'web' && !Files.isFileNameValid(newname)) {
return false; return false;
} else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') { } else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by Owncloud')); OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by Owncloud'));
return false; return false;
} }
if (FileList.lastAction) { if (FileList.lastAction) {
@ -712,9 +710,9 @@ $(document).ready(function() {
resizeBreadcrumbs(true); resizeBreadcrumbs(true);
// display storage warnings // display storage warnings
setTimeout ( "Files.displayStorageWarnings()", 100 ); setTimeout ( "Files.displayStorageWarnings()", 100 );
OC.Notification.setDefault(Files.displayStorageWarnings); OC.Notification.setDefault(Files.displayStorageWarnings);
}); });
function scanFiles(force,dir){ function scanFiles(force,dir){