Changeset 32853

Timestamp:

2019-03-04T21:57:57+13:00 (5 years ago)

Author:

ak19

Message:

Cleanup stage one: 1. Not calling addFunctionalityToTable() on GPSmapcontainer, and no need for a cutdown addFunctionalityToGPSMap(), since the GPS map editor doesn't use any of the added functionality anyway, going out of its way to set the css to display:hide on all the added functionality (metaNameField, addRowButton and addAllButton). 2. Selecting divs that have attribute contenteditable='true' rather than all elements with .sectionText class to get a list of all the editable elements that will get converted to CKEditors. I think it's only divs that have contenteditable set to true, in which case don't need to look for any and all elements with that attribute and value. 3. Some cleanup.

Location:

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

Files:

• documentedit_scripts.js (modified) (4 diffs)
• documentedit_scripts_util.js (modified) (2 diffs)

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

@@ -233 +233 @@
     mapGPScontainer.css("display", "none");
 
-    addFunctionalityToTable(mapGPScontainer); // **********************************
-    mapGPScontainer.metaNameField.css("display", "none");
-    mapGPScontainer.addRowButton.css("display", "none");
-    if (enable_add_all_metadata_button == true) {
-        mapGPScontainer.addAllButton.css("display", "none");
-    }
-
 }
 
@@ -290 +283 @@
 function readyPageForEditing() {
 
-    //   CKEDITOR.on('instanceReady', function(evt) {
-    //  addCKEEditableState(evt,editableInitStates);
-    //   });
-
     if ($("#metadataSetList").length) {
         var setList = $("#metadataSetList");
@@ -307 +296 @@
     //wait for 0.5 sec to let ckeditor up
     
-    // The following is now done in the CKEDTIOR.on('instanceReady') handler, which is added when docReady, see documentedit_scripts_util::$( document ).ready(...)
-    // Attempting CKEDTIOR.on('instanceReady') at the start of this method didn't work because it was probably too late in page load phase to add the event handler then
+    // Initialising editableInitStates for CKEDITOR instances now happens in the CKEDITOR.on('instanceReady') handler, which is added upon docReady, see documentedit_scripts_util::$( document ).ready(...)
+    // Attempting CKEDITOR.on('instanceReady') at the start of this method or anywhere in this method didn't work because it was probably too late in page load phase to add the event handler then
     // (the instanceReady() event would have been triggered before this method finally got called).
-    /*
-    setTimeout(function () {
-        $(".sectionText").each(function () {
-            addEditableState(this, editableInitStates);
-        });
-    }, 500);
-    */
+
     var editBar = $("#editBarLeft");
 
@@ -380 +363 @@
     // We need to keep track of editableElementsInitialisationProgress: the number of editable elements that need to be initialised/need to finish initialising
     // As CKEditors will be added, meaning more editable elements, must increment our counter editableElementsInitialisationProgress
-    var $num_editable_textareas = $(".sectionText"); // consider searching for 'contenteditable="true"' as this is what CKEDITOR is looking for (we think!) 
+    //var $num_editable_textareas = $(".sectionText"); // consider searching for 'contenteditable="true"' as this is what CKEDITOR is looking for (we think!)       
+    // I think for us it's always a <div> that has contenteditable="true", but to get all elements with attr contenteditable set to true,
+    // see https://stackoverflow.com/questions/4958081/find-all-elements-with-a-certain-attribute-value-in-jquery
+    // which has inefficient and slightly more efficient ways of doing that
+    var $num_editable_textareas = $('div[contenteditable="true"]'); 
     editableElementsInitialisationProgress += $num_editable_textareas.length;
     

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

@@ -945 +945 @@
 }
 
-function addFunctionalityToMapGPS(mapGPScontainer)
-{
-    
-}
-
 function addFunctionalityToTable(table)
 {
@@ -1013 +1008 @@
 
     // add metadata field selector
-        var metaNameField = createMetadataElementSelector();    
+    var metaNameField = createMetadataElementSelector();    
     table.after(metaNameField);
     table.metaNameField = metaNameField;