Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r8582bb3b3412620db230c2bfca0fd0c3f5dc27be -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 8582bb3b3412620db230c2bfca0fd0c3f5dc27be)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -441,7 +441,7 @@
 			_ddm.copyTypeID = r.copyTypeID;
 			
 			_ddm.modified = false;
-			getURL("javascript:setSaved('true');");
+			fscommand('setSaved', 'true');
 			LFMenuBar.getInstance().enableExport(true);
 			Debugger.log('_ddm.learningDesignID:'+_ddm.learningDesignID,Debugger.GEN,'onStoreDesignResponse','Canvas');		
 			
@@ -1088,7 +1088,8 @@
 		}
 		
 		_ddm.modified = true;
-		getURL("javascript:setSaved('false');");
+		
+		fscommand('setSaved', 'false');
 	}
 	
 	
@@ -1174,7 +1175,7 @@
 		if(ca.activity.helpURL != undefined || ca.activity.helpURL != null) {
 			Debugger.log("Opening help page with locale " + _root.lang + _root.country + ": " + ca.activity.helpURL,Debugger.GEN,'getHelp','Canvas');
 			var locale:String = _root.lang + _root.country;
-			getURL(ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale, '_blank');
+			fscommand("openURL", ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale);
 		} else {
 			if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){
 				var callback:Function = Proxy.create(this, openGroupHelp);
@@ -1192,14 +1193,14 @@
 		var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GROUP
 		var locale:String = _root.lang + _root.country;
 		var target:String = actToolSignature + app.module + '#' + actToolSignature+ app.module + '-' + locale;
-		getURL(url + target, '_blank');
+		fscommand("openURL", url + target);
 	}
 	
 	private function openGateHelp(url:String){
 		var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GATE
 		var locale:String = _root.lang + _root.country;
 		var target:String = actToolSignature + app.module + '#' + actToolSignature + app.module + '-' + locale;
-		getURL(url + target, '_blank');
+		fscommand("openURL", url + target);
 	}
 	
 	public function get toolActivityWidth():Number{
Index: lams_central/web/author.jsp
===================================================================
diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_central/web/author.jsp	(.../author.jsp)	(revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -76,18 +76,18 @@
 	}else if (command == "confirm"){
 		doConfirm(args);
 	}else if (command == "openPopUp"){
-		openPopUp(args);
+		openPopUpFS(args);
 	}else if(command == "openFilePopUp"){
 		openFilePopUp(args);
 	}else if (command == "setSaved"){
 		setSaved(args);
-	}else if (command == "closeUI"){
-		closeUI();
 	}else if(command == "openPreview"){
 		//this is called for Preview - to launch the learner UI. args will contain the sessionId to open
 		openPreview(args);
 	}else if(command == "closeWindow"){
-		closeWindow(args);
+		closeWindow();
+	}else if(command == "openURL"){
+		openURL(args, "_blank");
 	}
 
 }
@@ -125,6 +125,27 @@
 	//}
 }
 
+function openPopUpFS(args){
+	var params = args.split(",");
+	
+	// assigned the args
+	var url = params[0];
+	var title = params[1];
+	var h = params[2];
+	var w = params[3];
+	var resize = params[4];
+	var status = params[5];
+	var scrollbar = params[6];
+	var menubar = params[7];
+	var toolbar = params[8];
+	
+	openPopUp(url, title, h, w, resize, status, scrollbar, menubar, toolbar);
+}
+
+function openURL(args){
+	window.open(args);
+}
+
 var learnWin = null;
 
 function openFilePopUp(args){
@@ -142,8 +163,14 @@
 	theFilePopUp.moveTo(xPos, yPos);
 }
 
-function closeUI(){
-	window.close();
+function closeWindow(){
+	if(isInternetExplorer) {
+		this.focus();
+		window.opener = this;
+		window.close();
+	} else {
+		window.location.href = "javascript: window.close()";
+	}
 }
 
 function getHostURL(){
@@ -165,7 +192,7 @@
 }
 
 function myOnBeforeUnload(){
-//	alert("myOnBeforeUnload");
+	//alert("myOnBeforeUnload");
 	if(!saved){
 	  var message = '<fmt:message key="msg.design.not.saved"/>';
 	  if (typeof evt == 'undefined') {
@@ -178,8 +205,9 @@
 	}
 }
 
-// window.onbeforeunload = myOnBeforeUnload;
-
+if(window.attachEvent) { window.attachEvent("onbeforeunload", myOnBeforeUnload); }
+else { window.onbeforeunload = myOnBeforeUnload; }
+	
 //-->
 </script>
 <TITLE>Author :: LAMS</TITLE>
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r98f080c176194ea158a0c487f9fe9948bd329054 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r98f080c176194ea158a0c487f9fe9948bd329054 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -rc579ce5aa0cd1f8670d8ae7cd124a67a0a44f961 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision c579ce5aa0cd1f8670d8ae7cd124a67a0a44f961)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -145,7 +145,7 @@
 	public function openHelp(url:String) {
 		var locale:String = _root.lang + _root.country;
 		var target:String = this.module + '#' + this.module + '-' + locale;
-		getURL(url + target, '_blank');
+		fscommand("openURL", url + target);
 	}
 	
 	 /**
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
diff -u -r0fb0814770082235bdbaf186e4cdc4c0989f6e71 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 0fb0814770082235bdbaf186e4cdc4c0989f6e71)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -307,7 +307,7 @@
 				org.lamsfoundation.lams.monitoring.Application(app).getMonitor().getMV().getLessonTabView().scheduleLessonStart();
 				break;
 			case eventObj.menu.exitItem:
-				getURL('javascript: window.close();');
+				fscommand("closeWindow", null);
 				break;
         }        
     }
Index: lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as	(.../JsPopup.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as	(.../JsPopup.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -82,7 +82,7 @@
 			//getURL(url,"_blank");
 			
 			// open popup window using javascript method in hosting jsp
-			getURL("javascript:openPopUp('"+url+"', '" + windowTitle + "', '" + height + "', '" + width + "', '" + getValue(resize) + "', '" + getValue(status) + "', '" + getValue(scrollbar) + "', '" + getValue(menubar) + "', '" + getValue(toolbar) + "');");
+			fscommand("openPopUp", [url, windowTitle, height, width,getValue(resize), getValue(status) , getValue(scrollbar) , getValue(menubar) , getValue(toolbar)]);
 			
 			//getURL("javascript:openPreview('"+url+"', '"+windowTitle+"');");
 			//openPreview
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -r486897b39cf9e650ccc7700ebe00915739317642 -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision 486897b39cf9e650ccc7700ebe00915739317642)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
@@ -529,7 +529,7 @@
 	public function openLicenseURL(evt:Object){
 		var urlToOpen:String = licenseID_cmb.value.url;
 		if(urlToOpen != undefined){
-			getURL(urlToOpen,'_blank');
+			fscommand("openURL", urlToOpen);
 		}
 	}