Index: lams_central/src/flash/main.as
===================================================================
diff -u -rf19b88891438e209aa0874cb30375215825d6082 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/main.as	(.../main.as)	(revision f19b88891438e209aa0874cb30375215825d6082)
+++ lams_central/src/flash/main.as	(.../main.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -50,7 +50,10 @@
 if(StringUtils.isEmpty(requestSrc)) {
 	_root.requestSrc = null;
 }
-					   
+				
+if(StringUtils.isEmpty(isMac)) {
+	_root.isMac = false;
+}				
 
 //Set stage alignment to top left and prent scaling
 Stage.align = "TL";
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r6720d14ce9ab81408439c04643676bfcd07c5dca -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 6720d14ce9ab81408439c04643676bfcd07c5dca)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -451,7 +451,9 @@
 			_ddm.copyTypeID = r.copyTypeID;
 			
 			_ddm.modified = false;
-			fscommand('setSaved', 'true');
+			
+			ApplicationParent.extCall("setSaved", "true");
+			
 			LFMenuBar.getInstance().enableExport(true);
 			Debugger.log('_ddm.learningDesignID:'+_ddm.learningDesignID,Debugger.GEN,'onStoreDesignResponse','Canvas');		
 			
@@ -500,7 +502,7 @@
 	}
 	
 	public function closeReturnExt() {
-		fscommand("closeWindow", null);
+		ApplicationParent.extCall("closeWindow", null);
 	}
 	
 	/**
@@ -1022,7 +1024,7 @@
 			//JsPopup.getInstance().launchPopupWindow(serverUrl+'learning/main.jsp?userID='+uID+'&lessonID='+r+'&mode=preview', 'lWindow', 570, 796, true, true, false, false, false);
 			
 			// open preview in new window
-			fscommand("openPreview", r);
+			ApplicationParent.extCall("openPreview", r);
 			
 			Debugger.log('Recieved Lesson ID: '+r ,Debugger.GEN,'onLaunchPreviewResponse','Canvas');
 			//_global.breakpoint();
@@ -1125,7 +1127,7 @@
 		
 		_ddm.modified = true;
 		
-		fscommand('setSaved', 'false');
+		ApplicationParent.extCall('setSaved', 'false');
 	}
 	
 	
@@ -1211,7 +1213,9 @@
 		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;
-			fscommand("openURL", ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale);
+			
+			ApplicationParent.extCall("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);
@@ -1229,14 +1233,15 @@
 		var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GROUP
 		var locale:String = _root.lang + _root.country;
 		var target:String = actToolSignature + app.module + '#' + actToolSignature+ app.module + '-' + locale;
-		fscommand("openURL", url + target);
+		
+		ApplicationParent.extCall("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;
-		fscommand("openURL", url + target);
+		ApplicationParent.extCall("openURL", url + target);
 	}
 	
 	public function get toolActivityWidth():Number{
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rf7b36da8a833f3051e0c2194a6e51719c4d66148 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision f7b36da8a833f3051e0c2194a6e51719c4d66148)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -889,7 +889,7 @@
 				JsPopup.getInstance().launchPopupWindow(url, 'ToolActivityContent', 600, 800, true, true, false, false, false);
 			
 				// set modified (not-saved) flag so that potential changes cannot be lost.
-				fscommand('setSaved', 'false');
+				ApplicationParent.extCall('setSaved', 'false');
 			
 			}else{
 				new LFError("We dont have a valid toolContentID","openToolActivityContent",this);
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as
===================================================================
diff -u -r1d2fae09fa3447fdd476a8560cd8bf3ff257522e -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as	(.../PropertyInspectorNew.as)	(revision 1d2fae09fa3447fdd476a8560cd8bf3ff257522e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorNew.as	(.../PropertyInspectorNew.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -1207,7 +1207,8 @@
 	private function setModified():Void{
 		_canvasModel.getCanvas().ddm.validDesign = false;
 		_canvasModel.getCanvas().checkValidDesign();
-		fscommand("setSaved", "false");
+		
+		ApplicationParent.extCall("setSaved", "false");
 	}
 	
 }
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as
===================================================================
diff -u -r6720d14ce9ab81408439c04643676bfcd07c5dca -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as	(.../SaveConfirmDialog.as)	(revision 6720d14ce9ab81408439c04643676bfcd07c5dca)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as	(.../SaveConfirmDialog.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -42,8 +42,8 @@
 */
 class org.lamsfoundation.lams.authoring.cv.SaveConfirmDialog extends MovieClip {
 	
-	private var MARGIN = 10;
-	private var SPACING = 10;
+	private static var MARGIN:Number = 10;
+	private static var SPACING:Number = 10;
 	private var _canvasModel:CanvasModel;
 	private var _canvasController:CanvasController;
 	private var _msg:String;
@@ -189,8 +189,8 @@
 		 
 		if(tgt.indexOf('okBtn') != -1) {
 			_container.deletePopUp();
-		} else if(tgt.indexOf('retBtn') != -1) {
-			fscommand('closeWindow', null);
+		} else if(tgt.indexOf('retBtn') != -1) {
+			ApplicationParent.extCall('closeWindow', null);
 			_container.deletePopUp();
 		} else {
 			_container.deletePopUp();
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r1a175bfe9b4bc5309f3319accf2068eba3a9e902 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 1a175bfe9b4bc5309f3319accf2068eba3a9e902)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -575,7 +575,8 @@
 		var tabName:String = selectedTabName();
 		var locale:String = _root.lang + _root.country;
 		var target:String = app.module +tabName+ '#' + app.module +tabName+ '-' + locale;
-		fscommand("openURL", url + target);
+		
+		ApplicationParent.extCall("openURL", url + target);
 	}
 	/**
 	* Periodically checks if users have been loaded
Index: lams_central/src/flash/preloader.fla
===================================================================
diff -u -r77e843d80b8e329742e0ff887101e95b6be788f1 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
Binary files differ
Index: lams_central/web/author.jsp
===================================================================
diff -u -rafa83b17299af45eaf5559b6af50639a1c1ab5e8 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_central/web/author.jsp	(.../author.jsp)	(revision afa83b17299af45eaf5559b6af50639a1c1ab5e8)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -25,6 +25,7 @@
 
 %>
 <script src="<lams:LAMSURL/>includes/javascript/AC_RunActiveContent.js" type="text/javascript"></script>
+<script src="<lams:LAMSURL/>includes/javascript/getSysInfo.js" type="text/javascript"></script>
 <script language="JavaScript" type="text/JavaScript">
 <!--
 
@@ -239,16 +240,19 @@
 	
 //-->
 </script>
+
 <TITLE>Author :: LAMS</TITLE>
 </HEAD>
 <body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<c:set var="authorurl_params">?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=<lams:user property="userID"/>&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=<lams:user property="localeLanguage"/>&country=<lams:user property="localeCountry"/>&langDate=<%=languageDate%>&theme=<lams:user property="flashTheme"/>&actColour=<%= actColour %>&requestSrc=<c:if test="${not empty requestSrc}">${requestSrc}</c:if>&uniqueID=<lams:generateID/></c:set>
+<c:set var="authorurl_params">?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&userID=<lams:user property="userID"/>&serverURL=<%=pathToRoot%>&build=<%=authoringClientVersion%>&lang=<lams:user property="localeLanguage"/>&country=<lams:user property="localeCountry"/>&langDate=<%=languageDate%>&theme=<lams:user property="flashTheme"/>&actColour=<%= actColour %><c:if test="${not empty requestSrc}">&requestSrc=${requestSrc}</c:if>&uniqueID=<lams:generateID/></c:set>
 <c:set var="authorurl_nojs">lams_preloader.swf<c:out value="${authorurl_params}"/></c:set>
 <c:set var="authorurl_js">lams_preloader<c:out value="${authorurl_params}"/></c:set>
 
-	<script type="text/javascript">
-		AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','100%','height','100%','align','left','src','<c:out value="${authorurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','authoring', 'id', 'authoring', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie', '<c:out value="${authorurl_js}" escapeXml="false"/>' );
+	<script language="JavaScript" type="text/javascript">
+		Its();
+		AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','100%','height','100%','align','left','src','<c:out value="${authorurl_js}" escapeXml="false"/>&amp;isMac=' + isMac,'quality','high','scale','noscale','bgcolor','#FFFFFF','name','authoring', 'id', 'authoring', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie', '<c:out value="${authorurl_js}" escapeXml="false"/>&amp;isMac=' + isMac);
+			
 	</script>
 	
 	<noscript>
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r6720d14ce9ab81408439c04643676bfcd07c5dca -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r6720d14ce9ab81408439c04643676bfcd07c5dca -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
Binary files differ
Index: lams_central/web/lams_preloader.swf
===================================================================
diff -u -r77e843d80b8e329742e0ff887101e95b6be788f1 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r09d397307cdeb56f597caf45fde99302c4b541bd -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 09d397307cdeb56f597caf45fde99302c4b541bd)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -96,6 +96,21 @@
         return ApplicationParent._instance;
     }
 	
+	public static function extCall(method:String, param:String):Void {
+		var isMac:Boolean = (_root.isMac == "true")?true:false;
+		var versionNo:Number = _root.getSWFVersion();
+		Debugger.log("ExtCall:: method: " + method + " :: isMac: " + isMac, Debugger.GEN, "extCall", "ApplicationParent");
+		
+		if((versionNo <= 8) && (isMac)) {
+			Debugger.log("using Javascript method", Debugger.GEN, "extCall", "ApplicationParent");
+			getURL("javascript: " + method + "(" + param + ")");
+		} else {
+			Debugger.log("using FSCommand method", Debugger.GEN, "extCall", "ApplicationParent");
+			fscommand(method, param);
+		}
+
+	}
+	
 	/**
     * Called when Dictionary loaded
 	* @param evt:Object	the event object
@@ -147,7 +162,8 @@
 	public function openHelp(url:String) {
 		var locale:String = _root.lang + _root.country;
 		var target:String = this.module + '#' + this.module + '-' + locale;
-		fscommand("openURL", url + target);
+		
+		ApplicationParent.extCall("openURL", url + target);
 	}
 	
 	 /**
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
diff -u -r91c36f1db3f2c606d9519b3d4671b5f674469fd0 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 91c36f1db3f2c606d9519b3d4671b5f674469fd0)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -307,7 +307,7 @@
 				org.lamsfoundation.lams.monitoring.Application(app).getMonitor().getMV().getLessonTabView().scheduleLessonStart();
 				break;
 			case eventObj.menu.exitItem:
-				fscommand("closeWindow", null);
+				ApplicationParent.extCall("closeWindow", null);
 				break;
         }        
     }
Index: lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as
===================================================================
diff -u -rb52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as	(.../JsPopup.as)	(revision b52a7401b9b18c5ef2c4d19dadd24bdb2e2fb384)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/util/JsPopup.as	(.../JsPopup.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -78,14 +78,25 @@
 	 * @return  				returns nothing.
 	 */
 	public function launchPopupWindow(url:String, windowTitle:String, height:Number, width:Number, resize:Boolean, status:Boolean, scrollbar:Boolean, menubar:Boolean, toolbar:Boolean):Void{
-			//(args, title, h, w, resize, status, scrollbar)
-			//getURL(url,"_blank");
 			
 			// open popup window using javascript method in hosting jsp
-			fscommand("openPopUp", [url, windowTitle, height, width,getValue(resize), getValue(status) , getValue(scrollbar) , getValue(menubar) , getValue(toolbar)]);
+			var isMac:Boolean = (_root.isMac == "true")?true:false;
+			var versionNo:Number = _root.getSWFVersion();
+		
+			if((versionNo <= 8) && (isMac)) {
+				getURL("javascript: openPopUp('" + url + "'," +
+											  "'" + windowTitle + "'," +
+											  "'" + height + "'," + 
+											  "'" + width + "'," + 
+											  "'" + getValue(resize) + "'," +
+											  "'" + getValue(status) + "'," +
+											  "'" + getValue(scrollbar) + "'," +
+											  "'" + getValue(menubar) + "'," +
+											  "'" + getValue(toolbar) + "')");
+			} else {
+				fscommand("openPopUp", [url, windowTitle, height, width,getValue(resize), getValue(status) , getValue(scrollbar) , getValue(menubar) , getValue(toolbar)]);
+			}
 			
-			//getURL("javascript:openPreview('"+url+"', '"+windowTitle+"');");
-			//openPreview
 	}
 	
 	private function getValue(option:Boolean):String{
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -rf19b88891438e209aa0874cb30375215825d6082 -rb92c9032ebbd455eb0d4601d29ae2f8f6e8468e2
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision f19b88891438e209aa0874cb30375215825d6082)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision b92c9032ebbd455eb0d4601d29ae2f8f6e8468e2)
@@ -560,7 +560,7 @@
 	public function openLicenseURL(evt:Object){
 		var urlToOpen:String = licenseID_cmb.value.url;
 		if(urlToOpen != undefined){
-			fscommand("openURL", urlToOpen);
+			ApplicationParent.extCall("openURL", urlToOpen);
 		}
 	}