Index: lams_admin/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,23 +33,32 @@ Index: lams_central/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -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 =================================================================== diff -u -rb5d4a3d0dff42d3d9a26a22c0817e9b866b4b502 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision b5d4a3d0dff42d3d9a26a22c0817e9b866b4b502) +++ lams_central/web/includes/javascript/pedagogicalPlanner.js (.../pedagogicalPlanner.js) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -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 =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_gradebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_learning/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_learning/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_learning/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_monitoring/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_openid/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_openid/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_openid/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rcb0bd000d9418bd50c66fb920f6f2528d1b0f633 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision cb0bd000d9418bd50c66fb920f6f2528d1b0f633) +++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@ Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag =================================================================== diff -u -rd0c090e91794c1e3b6f91a51f4dd404b01160255 -r4de77285ae064a6cb2339e6e49f031b1b84388bf --- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision d0c090e91794c1e3b6f91a51f4dd404b01160255) +++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 4de77285ae064a6cb2339e6e49f031b1b84388bf) @@ -33,22 +33,32 @@