Changeset 30309 for main/trunk

Timestamp:

2015-10-31T12:03:04+13:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Fix ckeditor config to prevent creating &quot symbols from double quotes and replace for % symbol which led to failed rebuild.

Location:

main/trunk/greenstone3/web/interfaces/default/js

Files:

• ckeditor/config.js (modified) (1 diff)
• documentmaker_scripts_util.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/ckeditor/config.js

@@ -5 +5 @@
 
 CKEDITOR.editorConfig = function( config ) {
+    //Preventing convert entities
+    config.entities = false;
     // Define changes to default configuration here. For example:
     // config.language = 'fr';

main/trunk/greenstone3/web/interfaces/default/js/documentmaker_scripts_util.js

@@ -336 +336 @@
         {
             var section = changedElem.parentDiv.parentItem;
-            saveTransaction('{"operation":"setText", "text":"' + CKEDITOR.instances[changedElem.getAttribute("id")].getData().replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}'); //'
+            saveTransaction('{"operation":"setText", "text":"' + CKEDITOR.instances[changedElem.getAttribute("id")].getData().replace(/%/g, "%25").replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + section.collection + '", "oid":"' + section.nodeID + '"}'); //'
             addCollectionToBuild(section.collection);
         }
@@ -343 +343 @@
             var id = changedElem.getAttribute("id");
             var sectionID = id.substring(4);
-            saveTransaction('{"operation":"setText", "text":"' + CKEDITOR.instances[changedElem.getAttribute("id")].getData().replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + gs.cgiParams.c + '", "oid":"' + sectionID + '"}'); //'
+            saveTransaction('{"operation":"setText", "text":"' + CKEDITOR.instances[changedElem.getAttribute("id")].getData().replace(/%/g, "%25").replace(/"/g, "\\\"").replace(/&/g, "%26") + '", "collection":"' + gs.cgiParams.c + '", "oid":"' + sectionID + '"}'); //'
             addCollectionToBuild(gs.cgiParams.c);
         }