Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_leader/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_preview/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_tool_zoom/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){
Index: lams_www/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdbe381256743b49523ad8e294cbda8e42e19eb25 -r344294879f569481b17f20d37bc9884d35f06be2
--- lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dbe381256743b49523ad8e294cbda8e42e19eb25)
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 344294879f569481b17f20d37bc9884d35f06be2)
@@ -59,12 +59,12 @@
 </c:if>
 
 <script type="text/javascript">
-	function initializeCKEditor(){
+	function initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID){
 		
-		if ("${resizeParentFrameName}" != ""){
+		if (resizeParentFrameName != ""){
 			CKEDITOR.on('instanceReady', function(e){
-				if (e.editor.element.$.id == "${id}"){
-					var messageAreaFrame = window.parent.document.getElementById("${resizeParentFrameName}");
+				if (e.editor.element.$.id == id){
+					var messageAreaFrame = window.parent.document.getElementById(resizeParentFrameName);
 					if (messageAreaFrame != null){
 						messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
 					}
@@ -74,32 +74,36 @@
 		
 		CKEDITOR.basePath = "${ckEditorBasePath}";
 	    
-	    var editor = CKEDITOR.instances["${id}"];
+	    var editor = CKEDITOR.instances[id];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.${method}( "${id}", {
-				width                         : "${width}",
-				height                        : "${height}",
-				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
-				language                      : "${language}",
+		var instance = CKEDITOR[method](id, {
+				width                         : width,
+				height                        : height,
+				toolbar                       : toolbarSet,
+				classes                       : classes,
+				language                      : language,
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
-				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/${contentFolderID}/",
-				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/${contentFolderID}/",
-				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/${contentFolderID}/",
-				contentFolderID				  : "${contentFolderID}"
+				filebrowserBrowseUrl          : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=File&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserUploadUrl          : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=File&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Image&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Image&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserImageBrowseLinkUrl : "${ckEditorBasePath}filemanager/browser/default/browser.html?Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashBrowseUrl     : "${ckEditorBasePath}filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/jsp/connector&CurrentFolder=/" + contentFolderID + "/",
+				filebrowserFlashUploadUrl     : "${ckEditorBasePath}filemanager/upload/simpleuploader?Type=Flash&CurrentFolder=/" + contentFolderID + "/",
+				contentFolderID				  : contentFolderID
 		});
-		instance.initializeFunction = initializeCKEditor;
+		instance.initializeFunction = function(){
+			 initializeCKEditor(id, method, resizeParentFrameName, width, height, toolbarSet, classes, language, displayExpanded, contentFolderID);
+		};
 		return instance;
 	}
 	
 	// run when page is loaded
-	initializeCKEditor();
+	document.addEventListener("DOMContentLoaded", function(){
+		initializeCKEditor("${id}", "${method}", "${resizeParentFrameName}", "${width}", "${height}", "${toolbarSet}", "${classes}", "${language}", ${displayExpanded}, "${contentFolderID}");
+	});
 
 	function reinitializeCKEditorInstances(){
 		for (var instanceId in CKEDITOR.instances){