From 2a23a3320f08dc4ae85b81da64ccb5bdd5a486de Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Thu, 28 Mar 2024 15:02:38 -0700 Subject: [PATCH] Bug 36461: Advanced editor should disable RequireJS timeout with waitSeconds: 0 We aren't actually doing any error handling with the RequireJS waitSeconds config, just leaving the advanced editor hanging on loading if it times out, so instead we should disable it. Test plan: 1. Set the preference EnableAdvancedCatalogingEditor to Enable 2. Load the Cataloging module home page in Firefox and open Firefox's Web Developer Tools, and in the Network tab change from "No Throttling" to "Regular 2G" 3. In the Cataloging page, click Advanced editor, and watch it attempt to load for 30 seconds, followed by a setTimout error in the devtools console, and then wait as long as you can stand for anything but the "Loading, please wait..." to happen in the web page. Nothing ever will. 4. Apply the patch, restart, set EnableAdvancedCatalogingEditor back to Enable, turn throttling on, load the Advanced editor again, and note that even though it will take a minute or more to load through the throttling, the editor does actually load. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer (cherry picked from commit 95394217f081a38c3fe66f21d673aa056c83414b) Signed-off-by: Fridolin Somers (cherry picked from commit c305b468218bee1ece2e396762d2360ed628d71c) Signed-off-by: Lucas Gass --- koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 80e22e10a2..86f1932a05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -29,7 +29,7 @@ require.config( { themelang: '[% themelang | html %]', }, }, - waitSeconds: 30, + waitSeconds: 0, } ); -- 2.39.5