Changeset 30464
- Timestamp:
- 2016-04-04T10:07:34+12:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/hierarchy.js
r30382 r30464 231 231 232 232 var input = $(row.getElementsByClassName("metaTableCellArea")[0]).val(); 233 //RegExp to get SuggestionsMenu with dot 234 var SuggestionsMenuExp = new RegExp("^" + input.replace(/\./g, '\\.') + "[0-9]+$"); 235 //RegExp to get SuggestionsMenu without dot 236 var ChildrenExp = new RegExp("^" + input.replace(/\./g, '\\.') + "\\.[0-9]+$") 233 234 //RegExp to get SuggestionsMenu 235 var SuggestionsMenuExp = new RegExp("^0*" + input.replace(/\./g, '\\.0*') + "\\.?[0-9]+$") 237 236 //Hierarchy suggestions menu 238 237 var SuggestionsMenu = ""; 239 //Item number for SuggestionsMenu240 var i = 1;241 238 for(var key in hierarchyData) 242 239 { 243 240 var SuggestionsMenuItems = {}; 244 // Test if input ends with dot and key relates to appropriate input245 if (SuggestionsMenuExp.test(key) && /\.$/.test(input))241 242 if (SuggestionsMenuExp.test(key)) 246 243 { 247 248 SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >' + i + " " + hierarchyData[key] + '</button></li>'; 249 i++; 250 } 251 252 if (ChildrenExp.test(key)) 253 { 254 255 SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >.' + i + " " + hierarchyData[key] + '</button></li>'; 256 i++; 244 SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >' + key.substring(String(input).length) + " " + hierarchyData[key] + '</button></li>'; 257 245 } 258 246
Note:
See TracChangeset
for help on using the changeset viewer.