From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 19 Sep 2013 09:15:20 +0000 (+0200)
Subject: Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into... 
X-Git-Tag: v6.0.0alpha2~159^2~3^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eea02cee2fdec2fd40acf174349aab4e813658c9;p=nextcloud-server.git

Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/js/file-upload.js
---

eea02cee2fdec2fd40acf174349aab4e813658c9
diff --cc apps/files/js/file-upload.js
index 2c42f29445f,3cf43dff506..d1f2dabf831
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@@ -169,14 -169,14 +169,14 @@@ OC.Upload = 
  	},
  	/**
  	 * TODO checks the list of existing files prior to uploading and shows a simple dialog to choose
 -	 * skip all, replace all or choosw which files to keep
 +	 * skip all, replace all or choose which files to keep
- 	 * @param array selection of files to upload
- 	 * @param callbacks to call:
- 	 *		onNoConflicts,
- 	 *		onSkipConflicts,
- 	 *		onReplaceConflicts,
- 	 *		onChooseConflicts,
- 	 *		onCancel
+ 	 * @param {array} selection of files to upload
+ 	 * @param {object} callbacks - object with several callback methods
+ 	 * @param {function} callbacks.onNoConflicts
+ 	 * @param {function} callbacks.onSkipConflicts
+ 	 * @param {function} callbacks.onReplaceConflicts
+ 	 * @param {function} callbacks.onChooseConflicts
+ 	 * @param {function} callbacks.onCancel
  	 */
  	checkExistingFiles: function (selection, callbacks){
  		// TODO check filelist before uploading and show dialog on conflicts, use callbacks