Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.494 -r1.495
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.394 -r1.395
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as,v
diff -u -r1.43 -r1.44
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	29 Oct 2008 04:17:18 -0000	1.43
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	14 Nov 2008 04:29:47 -0000	1.44
@@ -291,7 +291,7 @@
 					var saveConfirmDialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('al_alert'),closeButton:false,scrollContentPath:"SaveConfirmDialog",msg:msg, requestSrc:_requestSrc, canvasModel:canvasModel,canvasController:cc});
 	
 				} else if(_ddm.editOverrideLock) {
-					var finishEditHandler = Proxy.create(this,finishEditOnFly);
+					var finishEditHandler = Proxy.create(this,finishEditOnFly, false, false);
 					msg = Dictionary.getValue('cv_eof_changes_applied');
 					LFMessage.showMessageAlert(msg, finishEditHandler);
 				} else {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as,v
diff -u -r1.45 -r1.46
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	21 Oct 2008 03:09:00 -0000	1.45
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	14 Nov 2008 04:29:47 -0000	1.46
@@ -393,7 +393,7 @@
 	 * @return  
 	 */
 	
-	public function finishEditOnFly(forced:Boolean) {
+	public function finishEditOnFly(forced:Boolean, cancelled:Boolean) {
 		Debugger.log('finishing and closing Edit On The Fly',Debugger.CRITICAL,'finishEditOnFly','Canvas');
 		Debugger.log('valid design: ' + _ddm.validDesign,Debugger.CRITICAL,'finishEditOnFly','Canvas');
 		Debugger.log('modified: ' + _ddm.modified,Debugger.CRITICAL,'finishEditOnFly','Canvas');
@@ -403,18 +403,19 @@
 		
 		if(forced) {
 			ApplicationParent.extCall("setSaved", "true");
-			finishLearningDesignCall(callback);
+			finishLearningDesignCall(callback, cancelled);
 			return;
 		}
 		
 		if(!_ddm.modified) {
-			if(_ddm.validDesign) finishLearningDesignCall(callback);
+			if(_ddm.validDesign) finishLearningDesignCall(callback, cancelled);
 			else LFMessage.showMessageAlert(Dictionary.getValue("cv_eof_finish_invalid_msg"));
-		} else LFMessage.showMessageConfirm(Dictionary.getValue("cv_eof_finish_modified_msg"), Proxy.create(this,finishEditOnFly, true), null);
+		} else LFMessage.showMessageConfirm(Dictionary.getValue("cv_eof_finish_modified_msg"), Proxy.create(this,finishEditOnFly, true, cancelled), null);
 	}
 	
-	private function finishLearningDesignCall(callback:Function) {
-		Application.getInstance().getComms().getRequest('authoring/author.do?method=finishLearningDesignEdit&learningDesignID='+_ddm.learningDesignID,callback, false);
+	private function finishLearningDesignCall(callback:Function, cancelled:Boolean) {
+		Debugger.log('finishLearningDesignCall with cancelled: ' + String(cancelled),Debugger.MED,'finishLearningDesignCall','CanvasHelper');
+		Application.getInstance().getComms().getRequest('authoring/author.do?method=finishLearningDesignEdit&learningDesignID='+_ddm.learningDesignID+'&cancelled='+String(cancelled),callback, false);
 	}
 	
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	21 Oct 2008 03:09:01 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	14 Nov 2008 04:29:47 -0000	1.7
@@ -123,7 +123,7 @@
 		}else if(tgt.indexOf("preview") != -1){
 			_app.getCanvas().launchPreviewWindow();
 		}else if(tgt.indexOf("cancel") != -1){
-			_app.getCanvas().finishEditOnFly();
+			_app.getCanvas().finishEditOnFly(false, true);
 		}
 	}