DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix upload

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-02-05 11:48:23 +03:00
parent ccc5af2709
commit df83dc5e12
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
js/documents.js
View File

@ -330,23 +330,6 @@ var documentsMain = {
); );
}, },
// FIXME: copy/pasted from Files.isFileNameValid, needs refactor into core
isFileNameValid:function (name) {
if (name === '.') {
throw t('files', '\'.\' is an invalid file name.');
} else if (name.length === 0) {
throw t('files', 'File name cannot be empty.');
}
// check for invalid characters
var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
for (var i = 0; i < invalid_characters.length; i++) {
if (name.indexOf(invalid_characters[i]) !== -1) {
throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
}
}
return true;
},
onRenamePrompt: function() { onRenamePrompt: function() {
var name = documentsMain.fileName; var name = documentsMain.fileName;
@ -370,7 +353,7 @@ var documentsMain = {
try { try {
input.tipsy('hide'); input.tipsy('hide');
input.removeClass('error'); input.removeClass('error');
if (documentsMain.isFileNameValid(newName)) { if (Files.isFileNameValid(newName)) {
input.tipsy('hide'); input.tipsy('hide');
input.remove(); input.remove();
$('#document-title>div').show(); $('#document-title>div').show();
@ -559,7 +542,30 @@ dojoConfig = {
} }
}; };
//init //init
var Files = Files || {
// FIXME: copy/pasted from Files.isFileNameValid, needs refactor into core
isFileNameValid:function (name) {
if (name === '.') {
throw t('files', '\'.\' is an invalid file name.');
} else if (name.length === 0) {
throw t('files', 'File name cannot be empty.');
}
// check for invalid characters
var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
for (var i = 0; i < invalid_characters.length; i++) {
if (name.indexOf(invalid_characters[i]) !== -1) {
throw t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.");
}
}
return true;
},
updateStorageStatistics: function(){}
};
$(document).ready(function() { $(document).ready(function() {
"use strict"; "use strict";
@ -592,6 +598,7 @@ $(document).ready(function() {
}); });
$('.add-document').on('click', '.add', documentsMain.onCreate); $('.add-document').on('click', '.add', documentsMain.onCreate);
var file_upload_start = $('#file_upload_start'); var file_upload_start = $('#file_upload_start');
file_upload_start.on('fileuploaddone', documentsMain.show); file_upload_start.on('fileuploaddone', documentsMain.show);
//TODO when ending a session as the last user close session? //TODO when ending a session as the last user close session?