Changeset 33096

Timestamp:

2019-05-17T19:41:19+12:00 (5 years ago)

Author:

wy59

Message:

Some improvements t

File:

• main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js (modified) (6 diffs)

main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js

@@ -1 @@
-
 
 function MapEditor(id) {
@@ -174 +173 @@
                     return message; 
                 }
-            }               
-        }
-        
-    }
-
-    $(function () {
+            }
+        }
+    }
+
+    // Having got our unique (set) of descriptions/labels, we're ready to set it up as the source for our autocomplete list
+    $(function setupAutocompleteLabelsList() {
         // Overrides the default autocomplete filter function to
         // search only from the beginning of the string
@@ -200 +199 @@
 MapEditor.prototype.addToAutocompleteLabelsList = function (newLabel) {
     
-    if (!this.autocompleteLabelsList.includes(newLabel)) {
-        // TODO: add to end with push, add to start with unshift or sort alphabetically?
-        this.autocompleteLabelsList.unshift(newLabel);
+    if (newLabel !== "" && !this.autocompleteLabelsList.includes(newLabel)) {
+        // add to autocomplete list and sort alphabetically
+        this.autocompleteLabelsList.push(newLabel);
+        this.autocompleteLabelsList.sort();
     }
 }
@@ -803 +803 @@
 MapEditor.prototype.LOAD = function (json_str, nodeID) {
     this.mapEditorHistory.historyOverlayPush();
-    
-    
+
     // This seems to convert the map_store object into an array and forces array index access, instead of convenient property access using nodeID   
     //Object.values(gsmap_store)[0]; // Always gets top level section's map-editor, not what we want.
@@ -817 +816 @@
     
     map_editor.overlays = new_overlays;
-    
+
+    var labels_hashmap = {};
     for (var i=0; i<map_editor.overlays.length; i++) {
         var shape = map_editor.overlays[i];
 
-        // set up the autocomplete list using saved labels/descriptions
-        map_editor.addToAutocompleteLabelsList(shape.description);
+        // set up the autocomplete list using saved labels/descriptions
+        //map_editor.addToAutocompleteLabelsList(shape.description); // inefficient in ensuring uniqueness of values, use (hash)map
+        if (shape.description !== "") {
+            labels_hashmap[shape.description] = 1;  // we just want the shape.description added to the map as key, don't care about value
+                                                    // so that we can maintain a list of unique descriptions
+        }
 
         // make the shapes selectable on load:
@@ -834 +838 @@
 
     this.mapEditorHistory.presentOverlayPush();
+    
+    var keys = Object.keys(labels_hashmap);
+    // DO NOT assign "this.autocompleteLabelsList = keys(labels_hashmap);"
+    // Because Javascript is like Java and (in this) like C, not like C++. JavaScript uses Call-By-Sharing for objects:
+    // when reference addresses that are overwritten inside functions,
+    // the new address local to the function is not remembered/visible back outside the function
+    // https://stackoverflow.com/questions/518000/is-javascript-a-pass-by-reference-or-pass-by-value-language
+    // Instead, push.apply=addAll elements of keys to our autocomplete list, see 
+    // https://stackoverflow.com/questions/35658464/what-is-the-equivalent-of-java-collection-addall-for-javascript-arrays/35658514
+    this.autocompleteLabelsList.push.apply(this.autocompleteLabelsList, keys); // addAll keys to our autocompleteLabelsList
+    this.autocompleteLabelsList.sort();
 }