Merge pull request #3164 from fcojfernandez/JENKINS-48080

[JENKINS-48080] Setup Wizard hangs if confirm password is incorrect while creating admin user
jenkinsci · Dec 2, 2017 · b3ebef20ece11cd8cfed0eb32558065150a18c9d · b3ebef2
2 parents 616a62a + 9b4e831
commit b3ebef20ece11cd8cfed0eb32558065150a18c9d
Unified Split

Showing with 4 additions and 3 deletions.

+4 −3 war/src/main/js/pluginSetupWizardGui.js
diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
@@ -889,16 +889,17 @@ var createPluginSetupWizard = function(appendTarget) {
 			// ignore JSON parsing issues, this may be HTML
 		}
 		// we get 200 OK
-  
-		var $page = $(data);
+  
+		var responseText = data.responseText;
+  
+		var $page = $(responseText);
 		var $errors = $page.find('.error');
 		if($errors.length > 0) {
 			var $main = $page.find('#main-panel').detach();
 			if($main.length > 0) {
-  
-				data = data.replace(/body([^>]*)[>](.|[\r\n])+[<][/]body/,'body$1>'+$main.html()+'</body');
+  
+				responseText = responseText.replace(/body([^>]*)[>](.|[\r\n])+[<][/]body/,'body$1>'+$main.html()+'</body');
 			}
 			var doc = $('iframe[src]').contents()[0];
 			doc.open();
-  
-			doc.write(data);
+  
+			doc.write(responseText);
 			doc.close();
 		}
 		else {