Merge pull request #5750 from openfoodfacts/fileupload

Do not load jquery.fileupload.js twice, fixes producers platform image upload bug
openfoodfacts · Sep 24, 2021 · 60811ec · 60811ec
2 parents 4306c28 + 92b2102
commit 60811ec
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/ProductOpener/Images.pm b/lib/ProductOpener/Images.pm
@@ -315,15 +315,20 @@ sub display_search_image_form($) {
 HTML
 ;
 
+	# Do not load jquery file upload twice, if it was loaded by another form
 
-	$scripts .= <<JS
+	if ($scripts !~ /jquery.fileupload.js/) {
+
+		$scripts .= <<JS
 <script type="text/javascript" src="/js/dist/jquery.iframe-transport.js"></script>
 <script type="text/javascript" src="/js/dist/jquery.fileupload.js"></script>
 <script type="text/javascript" src="/js/dist/load-image.all.min.js"></script>
 <script type="text/javascript" src="/js/dist/canvas-to-blob.js"></script>
 JS
 ;
 
+	}
+
 	$initjs .= <<JS
 
 \/\/ start off canvas blocks for small screens