Merge pull request #654 from owncloud/stable9-fix-upload

[Stable9] Fix upload
owncloud-archive · Aug 9, 2016 · cb7559b · cb7559b
2 parents 402dd3e + bbfa8d8
commit cb7559b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/js/documents.js b/js/documents.js
@@ -673,6 +673,12 @@ FileList = FileList || {};
 FileList.getCurrentDirectory = function(){
 	return $('#dir').val() || '/';
 };
+FileList.findFile = function(fileName){
+ 	fullPath = escapeHTML(FileList.getCurrentDirectory + '/' + fileName);
+ 	return !!$('.documentslist .document:not(.template,.progress) a[original-title="' + fullPath + '"]').length
+};
+FileList.highlightFiles = function(){};
+
 
 $(document).ready(function() {
 	documentsMain.docs = $('.documentslist').documentGrid();
@@ -695,6 +701,10 @@ $(document).ready(function() {
 
 	$('.add-document').on('click', '.add', documentsMain.onCreate);
 
+	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) {