Merge pull request #108 from owncloud/port-documents-652

Fix upload in richdocuments
pull/1/head
Andras Timar 8 years ago committed by GitHub
commit d16f783a5d

@ -951,6 +951,13 @@ FileList.isFileNameValid = function (name) {
return true;
}
FileList.setViewerMode = function(){
};
FileList.findFile = function(fileName){
fullPath = escapeHTML(FileList.getCurrentDirectory + '/' + fileName);
return !!$('.documentslist .document:not(.template,.progress) a[original-title="' + fullPath + '"]').length
}
$(document).ready(function() {
if (!OCA.Files) {
@ -993,6 +1000,10 @@ $(document).ready(function() {
$('.add-document').on('click', '.add-ods', documentsMain.onCreateODS);
$('.add-document').on('click', '.add-odp', documentsMain.onCreateODP);
OC.Upload._isReceivedSharedFile = function () {
return false;
}
var file_upload_start = $('#file_upload_start');
if (typeof supportAjaxUploadWithProgress !== 'undefined' && supportAjaxUploadWithProgress()) {
file_upload_start.on('fileuploadstart', function(e, data) {

@ -4,7 +4,6 @@ style( 'richdocuments', 'style' );
script('richdocuments', 'share');
script('richdocuments', 'documents');
script('files', 'file-upload');
script('files', 'jquery.iframe-transport');
script('files', 'jquery.fileupload');
?>
<div id="documents-content">

Loading…
Cancel
Save