Changeset 30464 for main/trunk/greenstone3/web/interfaces/default/js

Timestamp:

2016-04-04T10:07:34+12:00 (8 years ago)

Author:

Georgiy Litvinov

Message:

Fixed webeditor hierarchy suggestions menu.

File:

• main/trunk/greenstone3/web/interfaces/default/js/hierarchy.js (modified) (1 diff)

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

@@ -231 +231 @@
     
     var input = $(row.getElementsByClassName("metaTableCellArea")[0]).val();
-    //RegExp to get SuggestionsMenu with dot
-    var SuggestionsMenuExp = new RegExp("^" + input.replace(/\./g, '\\.') + "[0-9]+$");
-    //RegExp to get SuggestionsMenu without dot
-    var ChildrenExp = new RegExp("^" + input.replace(/\./g, '\\.') + "\\.[0-9]+$")
+    
+    //RegExp to get SuggestionsMenu
+    var SuggestionsMenuExp = new RegExp("^0*" + input.replace(/\./g, '\\.0*') + "\\.?[0-9]+$")
     //Hierarchy suggestions menu
     var SuggestionsMenu = "";
-    //Item number for SuggestionsMenu                       
-    var i = 1;
     for(var key in hierarchyData)
     {
     var SuggestionsMenuItems = {};
-    // Test if input ends with dot and key relates to appropriate input
-        if (SuggestionsMenuExp.test(key) && /\.$/.test(input)) 
+        
+        if (SuggestionsMenuExp.test(key)) 
         {
-            
-            SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >' + i + " "  + hierarchyData[key] + '</button></li>';
-            i++;                        
-        }
-        
-        if (ChildrenExp.test(key)) 
-        {
-            
-            SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >.' + i + " "  + hierarchyData[key] + '</button></li>';
-            i++;                        
+            SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >' + key.substring(String(input).length) + " "  + hierarchyData[key] + '</button></li>';
         }