Index: lams_central/web/fckeditor/editor/plugins/kaltura/fckplugin.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/kaltura/Attic/fckplugin.js,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/fckeditor/editor/plugins/kaltura/fckplugin.js	16 Feb 2012 18:27:13 -0000	1.1.2.3
+++ lams_central/web/fckeditor/editor/plugins/kaltura/fckplugin.js	26 Feb 2012 19:22:57 -0000	1.1.2.4
@@ -28,6 +28,11 @@
 // create an object to handle kaltura
 var kalturaObject = new Object() ;
 kalturaObject.Add = function(innerHTML){
-	FCK.InsertHtml(" ");
 	FCK.InsertHtml(innerHTML);
-}
\ No newline at end of file
+};
+kalturaObject.GetFCK = function(){
+	return FCK;
+};
+kalturaObject.GetFCKDomTools = function(){
+	return FCKDomTools;
+};
\ No newline at end of file
Index: lams_central/web/fckeditor/editor/plugins/kaltura/kaltura.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/kaltura/Attic/kaltura.jsp,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_central/web/fckeditor/editor/plugins/kaltura/kaltura.jsp	15 Feb 2012 16:16:33 -0000	1.1.2.5
+++ lams_central/web/fckeditor/editor/plugins/kaltura/kaltura.jsp	26 Feb 2012 19:22:57 -0000	1.1.2.6
@@ -42,7 +42,8 @@
 		//ui_conf_id of Kaltura Dynamic Player(KDP)
 		var KDP_UI_CONF_ID = "${KDP_UI_CONF_ID}";
 		
-		var kalturaObject=null;
+		var kalturaObject = null;
+		var FCKBrowserInfo = null;
 		//constant used for tracking user info
 		var USER_ID  = 'ANONYMOUS';
 		function initialize() {
@@ -53,6 +54,7 @@
 			    kalturaObject = oEditor.kalturaObject;
 			    FCKConfig = oEditor.FCKConfig;
 			    FCKLang = oEditor.FCKLang;
+			    FCKBrowserInfo = oEditor.FCKBrowserInfo;
 			}
 			
 			//check if LAMS has a Kaltura server configured
@@ -111,20 +113,24 @@
 		
 		//in order to use FCKEditor preview feature with IE9 applying http://www.aaronpeters.nl/blog/prevent-double-callback-execution-in-IE9 
 		function saveToFCKEditor(entries) {
-			var innerHTML = '';
+			var FCK = kalturaObject.GetFCK();
 			
-			//add divs containing videos
+			//check all videos uploaded successfully
 			for(var i = 0; i < entries.length; i++) {
 				var entryId = entries[i].entryId;
 				if ((entryId == null) || (entryId == "")) {
 					alert("An error occurred processing this video. Please, reupload it.");
 					return;
 				}
-				innerHTML +=	'<div id="kplayer' + entryId + '"><object height="400" width="360"><embed height="400" type="application/x-shockwave-flash" width="360" src="#"></embed></object></div>';
+			}	
+			
+			//focus on fckeditor. otherwise it could skip inserting html 
+			if (!FCKBrowserInfo.IsIE && ! FCKBrowserInfo.IsGecko) {
+				FCK.InsertHtml("&nbsp;");
 			}
-			//enable HTML5 support
-			innerHTML +=	'<script type="text/javascript" src="' + KALTURA_SERVER + '/p/' + PARTNER_ID + '/sp/' + SUB_PARTNER_ID + '/embedIframeJs/uiconf_id/' + KDP_UI_CONF_ID + '/partner_id/' + PARTNER_ID + '"><\/script>';
-
+			
+			//var innerHTML =	'<pre><div><script type="text/javascript" src="http://video.lkc.ntu.edu.sg/p/100/sp/10000/embedIframeJs/uiconf_id/4421528/partner_id/100"><\/script></div><script type="text/javascript">';
+			var innerHTML =	'<pre><div><script type="text/javascript" src="' + KALTURA_SERVER + '/p/' + PARTNER_ID + '/sp/' + SUB_PARTNER_ID + '/embedIframeJs/uiconf_id/' + KDP_UI_CONF_ID + '/partner_id/' + PARTNER_ID + '"><\/script></div>';
 			innerHTML +=	'<script type="text/javascript">';
 			
 			// this is the callback function; execute after external script finishes loading
@@ -160,10 +166,19 @@
 			innerHTML +=	'	};';
 			innerHTML +=	'}';
 			innerHTML +=	'document.getElementsByTagName("head")[0].appendChild(script);';
-
-			innerHTML +='<\/script>';
+			innerHTML +='<\/script></pre>';
+			FCK.InsertHtml(innerHTML) ;
 			
-			kalturaObject.Add(innerHTML);
+			//add divs which will contain videos
+			for(var i = 0; i < entries.length; i++) {
+				var entryId = entries[i].entryId;
+				
+				//var div = FCK.EditorDocument.createElement( "DIV" );
+				var div = FCK.InsertElement("DIV");
+				div.id = 'kplayer' + entryId; 
+				div.innerHTML = '<object height="400" width="360"><embed height="400" type="application/x-shockwave-flash" width="360" src="#"></embed></object>';
+			}
+
 		}
 	// -->
 	</script>