Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_admin/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:25 -0000 1.4
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:29 -0000 1.5
@@ -33,23 +33,32 @@
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_central/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:59 -0000 1.5
+++ lams_central/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:41 -0000 1.6
@@ -48,22 +48,33 @@
};
*/
- CKEDITOR.basePath = "${ckEditorBasePath}";
- CKEDITOR.replace( "${id}", {
- width : "${width}",
- height : "${height}",
- toolbar : "${toolbarSet}",
- 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}"
- });
+ function initializeCKEditor(){
+
+ CKEDITOR.basePath = "${ckEditorBasePath}";
+
+ if (CKEDITOR.instances["${id}"]) {
+ CKEDITOR.remove(CKEDITOR.instances["${id}"]);
+ }
+
+ CKEDITOR.replace( "${id}", {
+ width : "${width}",
+ height : "${height}",
+ toolbar : "${toolbarSet}",
+ 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}"
+ });
+ }
+
+ // run when page is loaded or explicitly after ajax form submit
+ initializeCKEditor();
Index: lams_central/web/includes/javascript/pedagogicalPlanner.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/pedagogicalPlanner.js,v
diff -u -r1.18 -r1.19
--- lams_central/web/includes/javascript/pedagogicalPlanner.js 19 Oct 2010 17:08:11 -0000 1.18
+++ lams_central/web/includes/javascript/pedagogicalPlanner.js 4 Nov 2010 20:22:41 -0000 1.19
@@ -116,6 +116,11 @@
if (activity.contentWindow.fillForm){
activity.contentWindow.fillForm();
}
+
+ // reeavaluate script initializing the CKEditor instance
+ if (activity.contentWindow.initializeCKEditor){
+ activity.contentWindow.initializeCKEditor();
+ }
}
}
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:12 -0000 1.4
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:33 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_learning/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:16 -0000 1.4
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:54 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:02 -0000 1.4
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:33 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_openid/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_openid/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_openid/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:39:00 -0000 1.4
+++ lams_openid/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:21 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:27 -0000 1.4
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:17 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:31 -0000 1.4
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:00 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:33 -0000 1.4
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:10 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/tags/Attic/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:51 -0000 1.4
+++ lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:07 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:36:48 -0000 1.4
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:37 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:10 -0000 1.4
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:59 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:20 -0000 1.4
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:55 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:22 -0000 1.4
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:51 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:08 -0000 1.4
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:03 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:38 -0000 1.4
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:10 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:47 -0000 1.4
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:26 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:56 -0000 1.4
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:14 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag 27 Oct 2010 18:00:10 -0000 1.5
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:36 -0000 1.6
@@ -33,22 +33,32 @@
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:36:57 -0000 1.4
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:02 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:18 -0000 1.4
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:51 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:42 -0000 1.4
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:22:48 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:39:05 -0000 1.4
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:44 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:03 -0000 1.4
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:06 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:35 -0000 1.4
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:14 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:36:53 -0000 1.4
+++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:24:17 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:38:29 -0000 1.4
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:40 -0000 1.5
@@ -33,22 +33,32 @@
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag 24 Oct 2010 13:37:06 -0000 1.4
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag 4 Nov 2010 20:23:47 -0000 1.5
@@ -33,22 +33,32 @@