Merge pull request #9410 from jrafanie/fix-jquery-3-issue

GilbertCherrie · web-flow · commit 1a9995f7f9dd · 2025-04-30T12:41:11.000-04:00
Define a custom script dataType converter, don't override the base one
diff --git a/app/javascript/oldjs/jquery_overrides.js b/app/javascript/oldjs/jquery_overrides.js
@@ -36,7 +36,7 @@ $.ajaxSetup({
         return jQuery.parseJSON(text);
       });
     }),
-    'text script': logError(function(text) {
+    'text miq_script': logError(function(text) {
       if (text.match(/^{/)) {
         return jQuery.jsonPayload(text, function(text) {
           return text;
diff --git a/app/javascript/oldjs/miq_application.js b/app/javascript/oldjs/miq_application.js
@@ -1123,8 +1123,8 @@ window.miqJqueryRequest = function(url, options) {
   };
 
   if (options.dataType === undefined) {
-    ajax_options.accepts = { script: `*/*;q=0.5, ${$.ajaxSettings.accepts.script}` };
-    ajax_options.dataType = 'script';
+    ajax_options.accepts = { miq_script: `*/*;q=0.5, ${$.ajaxSettings.accepts.script}` };
+    ajax_options.dataType = 'miq_script';
   }
 
   // copy selected options over

Original file line number	Diff line number	Diff line change
`@@ -1123,8 +1123,8 @@ window.miqJqueryRequest = function(url, options) {`
`1123`	`1123`	`};`
`1124`	`1124`
`1125`	`1125`	`if (options.dataType === undefined) {`
`1126`		- ajax_options.accepts = { script: `/;q=0.5, ${$.ajaxSettings.accepts.script}` };
`1127`		`- ajax_options.dataType = 'script';`
	`1126`	+ ajax_options.accepts = { miq_script: `/;q=0.5, ${$.ajaxSettings.accepts.script}` };
	`1127`	`+ ajax_options.dataType = 'miq_script';`
`1128`	`1128`	`}`
`1129`	`1129`
`1130`	`1130`	`// copy selected options over`