Changeset 33100 for main/trunk

Timestamp:

2019-05-21T18:45:25+12:00 (5 years ago)

Author:

wy59

Message:

Removed debugging and tidied up the format.

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

@@ -38 +38 @@
     this.resizable = false;
     this.dontResize = false;
-    
 
     this.shapeOptions = {
@@ -182 +181 @@
 }
 
-
 // Ensure only unique labels are added to our autocomplete list
 MapEditor.prototype.addToAutocompleteLabelsList = function (newLabel) {
-    
     if (newLabel !== "" && !global_autocompleteLabelsList.includes(newLabel)) {
         // add to autocomplete list and sort alphabetically
@@ -191 +188 @@
         global_autocompleteLabelsList.sort();        
     }
-
-    console.log("the added new label to global autocomplete array:"); console.log(global_autocompleteLabelsList);
 }
 
@@ -827 +822 @@
 
     this.mapEditorHistory.presentOverlayPush();
-    
     
     // DO NOT assign "this.autocompleteLabelsList = keys(local_labels_hashmap);"
@@ -840 +834 @@
     // https://stackoverflow.com/questions/929776/merging-objects-associative-arrays
     // We've decided to use the jQuery based suggested solution for merging hashmaps:
-    // $.extend(obj1, obj2); means obj1 = obj1 + obj2. Overwriting any existing properties in obj1 with new values in obj2.
-
-    console.log("@@@@ Adding local contents to global: "); console.log(local_labels_hashmap);
-    console.log("@@@@ global map before: "); console.log(global_labels_hashmap);
-    
-
+    // $.extend(obj1, obj2); means obj1 = obj1 + obj2. Note: it additionally overwrites any existing properties in obj1 with new values in obj2.
     $.extend(global_labels_hashmap, local_labels_hashmap);
 
-    console.log("@@@@ global map after: "); console.log(global_labels_hashmap);
-
     // important to empty our global autocomplete labels list array
-    //See https://stackoverflow.com/questions/1232040/how-do-i-empty-an-array-in-javascript
-    // and https://www.jstips.co/en/javascript/two-ways-to-empty-an-array/
+    // See https://stackoverflow.com/questions/1232040/how-do-i-empty-an-array-in-javascript
+    // and https://www.jstips.co/en/javascript/two-ways-to-empty-an-array/
     global_autocompleteLabelsList.length = 0;
     
     var keys = Object.keys(global_labels_hashmap);
     global_autocompleteLabelsList.push.apply(global_autocompleteLabelsList, keys); // addAll keys to our global_autocompleteLabelsList (turns map's keys into array)
-
-    console.log("@@@@ global ARRAY after setting to global map: "); console.log(global_autocompleteLabelsList);
     global_autocompleteLabelsList.sort();   
 }
@@ -902 +887 @@
     }
 }
-
 
 // Having got our unique (set) of descriptions/labels, we're ready to set it up as the source for our autocomplete list