Merge pull request #1489 from drgrice1/fix-problem-editor-new-window

Fix the "Open in new window" checkbox behavior for the problem editor.

Author: mgage

htdocs/js/apps/PGProblemEditor/pgproblemeditor.js

@@ -41,9 +41,10 @@
 		var actionSave = document.getElementById('action_save');
 
 		var target = "_self";
-		if ((actionView && actionView.classList.contains('active')) || (actionSave && actionSave.classList.contains('active'))) {
-			target = document.getElementById("newWindow").checked ? "WW_View" : "pg_editor_frame";
-		}
+		if (actionView && actionView.classList.contains('active'))
+			target = document.getElementById("newWindowView").checked ? "WW_View" : "pg_editor_frame";
+		else if (actionSave && actionSave.classList.contains('active'))
+			target = document.getElementById("newWindowSave").checked ? "WW_View" : "pg_editor_frame";
 
 		$("#editor").attr('target', target);
 

lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm

@@ -1168,7 +1168,7 @@ sub view_form {
 				-input_attr=>{-name=>'action.view.displayMode', -values=>$self->r->ce->{pg}->{displayModes}, -default=>$self->{displayMode}}),
 			CGI::br(),
 			CGI::div({ class => "pg_editor_new_window_div" },
-				WeBWorK::CGI_labeled_input(-type => "checkbox", -id => "newWindow", -label_text => $r->maketext("Open in new window")))
+				WeBWorK::CGI_labeled_input(-type => "checkbox", -id => "newWindowView", -label_text => $r->maketext("Open in new window")))
 		);
 	}
 
@@ -1465,7 +1465,7 @@ sub save_form {
 
 		return $r->maketext("Save to [_1] and View", CGI::b($self->shortPath($self->{editFilePath}))) .
 			CGI::div({ class => "pg_editor_new_window_div" },
-				WeBWorK::CGI_labeled_input(-type => "checkbox", -id => "newWindow", -label_text => $r->maketext("Open in new window")));
+				WeBWorK::CGI_labeled_input(-type => "checkbox", -id => "newWindowSave", -label_text => $r->maketext("Open in new window")));
 
 	} else {
 		return ""; #"Can't save -- No write permission";