Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -114,6 +114,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -67,7 +67,7 @@
 </c:if>
 
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
-	
+
 <!-- begin tab content -->
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
@@ -88,7 +88,7 @@
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
-		}
+    	}
     }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -112,7 +114,7 @@
     	if(userAgent.indexOf('MSIE') != -1)
         	window.opener = "authoring"
     	window.close();
-    }
+    }  				
 </script>	
 <p id="saveCancelButtons" >
 		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -101,6 +101,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r3cda86bc223f3388c928ad0139a23d783847b6ac -rf1a03ca91d1c854de001bba1930dc65686e08a21
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
@@ -98,6 +98,8 @@
 		} else {
 			if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
+			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				window.location.href = notifyCloseURL;
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}