Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_central/web/includes/javascript/common.js
===================================================================
diff -u -rf4e47145c5e5a3861dc2cf26a460d80ef3e77308 -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_central/web/includes/javascript/common.js (.../common.js) (revision f4e47145c5e5a3861dc2cf26a460d80ef3e77308)
+++ lams_central/web/includes/javascript/common.js (.../common.js) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -95,4 +95,16 @@
window.opener.location.href = monitoringURL;
}
}
+
+ //does Ajax call (pure JavaScript without relying on frameworks)
+ function doAjaxCall(url) {
+ var xmlhttp;
+ if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari
+ xmlhttp = new XMLHttpRequest();
+ } else {// code for IE6, IE5
+ xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+ }
+ xmlhttp.open("POST", url, true);
+ xmlhttp.send();
+ }
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
@@ -111,6 +112,7 @@
if(userAgent.indexOf('MSIE') != -1)
window.opener = "authoring"
window.close();
+ return false;
}
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -109,10 +109,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r36b8c6add495d29cb4552ddd96ad7758bb8d118a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r36b8c6add495d29cb4552ddd96ad7758bb8d118a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -reee4133f13ea2058ce41967f03c7a73d96421b63 -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision eee4133f13ea2058ce41967f03c7a73d96421b63)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r36b8c6add495d29cb4552ddd96ad7758bb8d118a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r36b8c6add495d29cb4552ddd96ad7758bb8d118a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 36b8c6add495d29cb4552ddd96ad7758bb8d118a)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -96,10 +96,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf98861f7614ec6d2fd3020dcafa867e479ee018a -r3cda86bc223f3388c928ad0139a23d783847b6ac
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision f98861f7614ec6d2fd3020dcafa867e479ee018a)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 3cda86bc223f3388c928ad0139a23d783847b6ac)
@@ -93,10 +93,11 @@
if (nextAction == "defineLater") {
refreshParentMonitoringWindow();
}
- location.href="";
+ var clearSessionUrl = "";
+ doAjaxCall(clearSessionUrl);
} else {
if (window.parent.opener == null){
- window.location.href = notifyCloseURL;
+ doAjaxCall(notifyCloseURL);
} else {
window.parent.opener.location.href = notifyCloseURL;
}