Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	26 Nov 2012 09:43:37 -0000	1.13
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	27 Nov 2012 16:02:11 -0000	1.14
@@ -83,10 +83,10 @@
 		}
 	}
     function doSubmit_Form_Only() {
-    	var save = serialiseMarkers();
-    	if (save) {
-    		saveMapState();
-    		document.getElementById("${formID}").submit();
+    	var form = document.getElementById("${formID}");
+    	//invoke onsubmit event if it's available, submit form afterwards
+    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
+    		form.submit();
     	}
     }
     function doCancel() {
Index: lams_tool_gmap/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/authoring/authoring.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/web/pages/authoring/authoring.jsp	3 Jun 2008 03:53:16 -0000	1.4
+++ lams_tool_gmap/web/pages/authoring/authoring.jsp	27 Nov 2012 16:02:11 -0000	1.5
@@ -2,9 +2,21 @@
 
 <%@ page import="org.lamsfoundation.lams.tool.gmap.util.GmapConstants"%>
 
+<script type="text/javascript">
+	function onSubmitHandler() {
 
-<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+		//boolean indicating whether we can proceed
+    	var save = serialiseMarkers();
+    	if (save) {
+    		saveMapState();
+    	}
+    	return save;
+    	
+	}
+</script>
 
+<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data" onsubmit="return onSubmitHandler()">
+
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.10 -r1.11
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	26 Nov 2012 09:45:40 -0000	1.10
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	27 Nov 2012 16:00:51 -0000	1.11
@@ -83,9 +83,11 @@
 		}
 	}
     function doSubmit_Form_Only() {
-    	var code = window.frames["externalSpreadsheet"].cellsToJS();
-    	document.getElementById("spreadsheet.code").value = code;
-    	document.getElementById("${formID}").submit();
+    	var form = document.getElementById("${formID}");
+    	//invoke onsubmit event if it's available, submit form afterwards
+    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
+    		form.submit();
+    	}
     }
     function doCancel() {
     	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
Index: lams_tool_spreadsheet/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/authoring/authoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	6 Oct 2010 10:17:16 -0000	1.3
+++ lams_tool_spreadsheet/web/pages/authoring/authoring.jsp	27 Nov 2012 16:00:51 -0000	1.4
@@ -40,6 +40,12 @@
         	myForm.submit();
         }
         
+    	function onSubmitHandler() {
+        	var code = window.frames["externalSpreadsheet"].cellsToJS();
+        	document.getElementById("spreadsheet.code").value = code;
+        	return true;
+    	}
+        
     </script>
 	<!-- ******************** END CK Editor related javascript & HTML ********************** -->
 
@@ -62,7 +68,7 @@
 		
 	<%@ include file="/common/messages.jsp"%>
 
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" onsubmit="return onSubmitHandler();">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="spreadsheet.contentId" />
 		<html:hidden property="sessionMapID" />