Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,7 +114,6 @@
     	if(userAgent.indexOf('MSIE') != -1)
         	window.opener = "authoring"
     	window.close();
-    	return false;
     }  				
 </script>	
 <p id="saveCancelButtons" >
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -66,15 +66,13 @@
 	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
 </c:if>
 
-<c:set var="unableToSaveMsgKey" value="authoring.msg.one.question.to.be.saved" scope="request"/>
-
 <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 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -85,18 +83,7 @@
 		}
 	}
     function doSubmit_Form_Only() {
-    	var amountOfQuestions = $('#questionTable tr').size();
-    	var amountOfReferences = $('#referencesTable tr').size();
-
-		if( amountOfQuestions <= 1 ) {
-			$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
-	    	document.getElementById("${formID}").submit();
-		} else if (amountOfReferences > amountOfQuestions) {
-			alert("<fmt:message key='label.authoring.basic.warning.too.many.questions'/>");
-		} else {
-	    	$("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
-	    	document.getElementById("${formID}").submit();
-		}
+    	document.getElementById("${formID}").submit();
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
@@ -112,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -127,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_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -87,9 +87,9 @@
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	    	closeWindow("cancel");
-	    }
-	}
+    		closeWindow("cancel");
+    	}
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -89,7 +89,7 @@
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
     	}
-    }  	
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -89,7 +89,7 @@
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
     	}
-    } 
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -70,9 +70,9 @@
 
 <!-- begin tab content -->
 <script type="text/javascript">
-	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -89,7 +89,7 @@
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
     	}
-    }  
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -89,7 +89,7 @@
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
     	}
-    } 
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -89,7 +89,7 @@
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
     	}
-    } 
+    }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
 		if (notifyCloseURL == ""){
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -72,7 +72,7 @@
 <script type="text/javascript">
 	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-
+		
 		//if defineLater is true close current window
 		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
 			closeWindow("defineLater");
@@ -99,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -114,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_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf1a03ca91d1c854de001bba1930dc65686e08a21 -rf5b39b63222050e14531ed49a96c16afe7c77b3b
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f1a03ca91d1c854de001bba1930dc65686e08a21)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
@@ -62,9 +62,12 @@
 <c:if test="${empty accessMode}">
 	<c:set var="accessMode" value="author" scope="request"/>
 </c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</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 
@@ -85,7 +88,7 @@
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
     		closeWindow("cancel");
-		}
+    	}
     }
     function closeWindow(nextAction) {
 		var notifyCloseURL = "${notifyCloseURL}";
@@ -96,10 +99,10 @@
 			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 			doAjaxCall(clearSessionUrl);
 		} else {
-			if (window.parent.opener == null){
-				doAjaxCall(notifyCloseURL);
-			} else if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
 				window.location.href = notifyCloseURL;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
 			} else {
 				window.parent.opener.location.href = notifyCloseURL;
 			}
@@ -111,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">