Merge tag 'v5.01' into develop

should now also work on safari

rowers/templates/document_form.html

@@ -66,7 +66,21 @@
     {% block scripts %}
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<script>   
+    <script>
+      var td = new FormData();
+      var formdatasetok = false;
+      try {
+      td.set('aap','noot');
+      formdatasetok = true;
+      console.log('FormData.set OK');
+      }
+  catch(err) {
+  console.log('FormData.set not OK');
+  formdatasetok = false;
+  }
+
+  if (formdatasetok) {
+      
   $(document).ready(function() {
   var csrftoken = jQuery("[name=csrfmiddlewaretoken]").val();
   console.log("CSRF token",csrftoken);
@@ -87,8 +101,17 @@
 
   
   var frm = $("#file_form");
+
+  if( window.FormData === undefined ) {
+  console.log('no formdata');
+  alert("No FormData");
+  } else {
+  console.log('we have formdata');
+  }
+  
   var data = new FormData(frm[0]);
 
+
   $('#id_file').on('change', function(evt) {
      var f = this.files[0];
   console.log(f);
@@ -146,10 +169,13 @@
   console.log($(this).attr('id'),$(this).attr('name'),$(this).val());
   });
   });
-  
+
   frm.submit(function() {
   console.log("Form submission");
-  console.log(data);
+  $(data.values()).each(function(value) {
+  console.log(value);
+  });
+
   $("#id_drop-files").replaceWith(
   '<div id="id_waiting"><img src="/static/img/ajax_loader_blue_350.gif" width="120" height="100">'
   );
@@ -176,9 +202,10 @@
     }
     });
   return false;
-  });
+    });
 
-  $('#id_drop-files').bind({
+
+    $('#id_drop-files').bind({
   drop: function(e) {
   e.preventDefault();
   console.log("you dropped something");
@@ -215,12 +242,11 @@
     console.log("Set offline to True");
     $('#extra_message').text('Because of the large size, we recommend to use  background processing. You will receive email when it is done. The extra actions will not be performed.');
     $('#extra_message').addClass('message');      
-    }
+        }
+        data.set("file",f);        
+//    data.append("file",f);
 
-
-
-    data.append("file",files[0]);
-  $("#id_file").replaceWith('<div id="id_file">'+files[0].name+'&nbsp; <a class="remove" href="javascript:void(0);"><b><font color="red">X</font></b></a></div>');
+        $("#id_file").replaceWith('<div id="id_file">'+files[0].name+'&nbsp; <a class="remove" href="javascript:void(0);"><b><font color="red">X</font></b></a></div>');
   },
   mouseenter:function(){$("#id_drop-files").css("background-color","#E9E9E4");},
   mouseleave:function(){$("#id_drop-files").css("background-color","#FFFFFF");},
@@ -232,6 +258,7 @@
     $(document).on("click", "a.remove", function() {
     $(this).parent().replaceWith('<td><input id="id_file" name="file" type="file" /></td>');
     });
-  })
-</script>
+  });
+};
+    </script>
     {% endblock %}