Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

src/Handler/Utils/Form.hs

@@ -420,8 +420,8 @@ uploadModeForm prev = multiActionA actions (fslI MsgSheetUploadMode) (classifyUp
                 let iStart = maybe 0 (succ . fst) $ Map.lookupMax oldRess
                  in pure $ Map.singleton iStart fileRes
           return (addRes', formWidget')
-        miCell _ initFile initFile' nudge csrf =
-          sFileForm nudge (Just $ fromMaybe initFile initFile') csrf
+        miCell _ initFile _ nudge csrf =
+          sFileForm nudge (Just initFile) csrf
         miDelete = miDeleteList
         miAllowAdd _ _ _ = True
         miAddEmpty _ _ _ = Set.empty

static/js/utils/form.js

@@ -322,7 +322,9 @@
 
       // cancel the unload event. This is the standard to force the prompt to appear.
       event.preventDefault();
-      // for all non standard compliant browsers we return a truthy value to activate the prompt.
+      // chrome apparently does not comply to standards. We need to set the events' returnValue as well.
+      event.returnValue = true;
+      // for all other non standard compliant browsers we return a truthy value to activate the prompt.
       return true;
     }