Merge branch 'master' of github.com:transloadit/uppy

packages/@uppy/locales/src/fr_FR.js

@@ -7,6 +7,8 @@ fr_FR.strings = {
   addingMoreFiles: 'En train d\'ajouter des fichiers',
   allowAccessDescription: 'Pour prendre des photos ou enregistrer une vidéo avec votre caméra, veuillez autoriser l\'accès à votre caméra pour ce site.',
   allowAccessTitle: 'Veuillez autoriser l\'accès à votre caméra',
+  authenticateWith: 'Se connecter à %{pluginName}',
+  authenticateWithTitle: 'Veuillez vous authentifier avec %{pluginName} pour sélectionner les fichiers',
   back: 'Retour',
   browse: 'naviguer',
   cancel: 'Annuler',
@@ -64,6 +66,7 @@ fr_FR.strings = {
   pause: 'Pause',
   pauseUpload: 'Mettre en pause le téléchargement',
   paused: 'En pause',
+  poweredBy: 'Soutenu par',
   preparingUpload: 'Préparation du téléchargement...',
   processingXFiles: {
     '0': 'Traitement de %{smart_count} fichier',

packages/@uppy/robodog/src/form.js

@@ -18,10 +18,15 @@ function form (target, opts) {
     name: 'transloadit'
   })
 
+  let submitOnSuccess = true
+  if (opts.hasOwnProperty('submitOnSuccess')) {
+    submitOnSuccess = !!opts.submitOnSuccess
+  }
+
   uppy.use(Form, {
     target,
     triggerUploadOnSubmit: true,
-    submitOnSuccess: true,
+    submitOnSuccess: submitOnSuccess,
     addResultToForm: false // using custom implementation instead
   })
 

website/src/docs/robodog-form.md

@@ -223,14 +223,14 @@ There are no `on*()` _options_ anymore, but `.on('...')` methods are provided in
 
 | jQuery SDK option | Robodog Event |
 |---------------|--------------------------|
-| `onStart` | `.on('transloadit:assembly-created')` |
-| `onExecuting` | `.on('transloadit:assembly-executing')` |
-| `onFileSelect` | `.on('file-added')` |
-| `onProgress` | `.on('upload-progress` |
-| `onUpload` | `.on('transloadit:upload')` |
-| `onResult` | `.on('transloadit:result')` |
-| `onCancel` | `.on('transloadit:cancel')` or `.on('file-cancel')` for individual files |
-| `onError` | `.on('error')` |
-| `onSuccess` | `.on('transloadit:complete')` |
+| `onStart` | `.on('transloadit:assembly-created', (assembly) => {})` |
+| `onExecuting` | `.on('transloadit:assembly-executing', (assembly) => {})` |
+| `onFileSelect` | `.on('file-added', (file) => {})` |
+| `onProgress` | `.on('progress`, (percentage) => {})) for total upload progress taking all files into account.<br />`.on('upload-progress', (file, progress) => {})` for file-specific upload progress. |
+| `onUpload` | `.on('transloadit:upload', (file) => {}))` |
+| `onResult` | `.on('transloadit:result', (stepName, resultFile) => {}))` |
+| `onCancel` | `.on('transloadit:cancel', (assembly) => {}))`<br />or `.on('file-removed', (file) => {})` for individual files |
+| `onError` | `.on('error', (error) => {})` <br /><br />The error object might contain an `.assembly` property with an Assembly status for errors that happened during the execution of the Assembly. |
+| `onSuccess` | `.on('transloadit:complete', (assembly) => {})` |
 | `onDisconnect` | Currently unavailable, use something like [`is-offline`](https://www.npmjs.com/package/is-offline) |
 | `onReconnect` | Currently unavailable, use something like [`is-offline`](https://www.npmjs.com/package/is-offline) |