--

geosiris-technologies · Sep 25, 2024 · 51dd992 · 51dd992
1 parent dc7ecc6
commit 51dd992
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/main/webapp/jsp/htmlParts/modal_PropertiesDictVue.jsp b/src/main/webapp/jsp/htmlParts/modal_PropertiesDictVue.jsp
@@ -17,24 +17,22 @@ limitations under the License.
 	<script type="module">
 		import {filterJsonDictUI, refreshPropertyDictVue} from "/ressources/script/modules/UI/modals/propertiesVue.js";
 		import {onEnterPressed} from "/ressources/script/modules/UI/htmlUtils.js";
+		function filter_dict(event){
+			filterJsonDictUI('container_PropertiesDict',
+									"counter_PropertiesDict",
+									document.getElementById('FilterPropertiesDict').value,
+									document.getElementById('caseSenstive_PropertiesDict').checked,
+									document.getElementById('splitWords_PropertiesDict').checked,
+									document.getElementById('FilterPropertiesAttribute').value);
+		}
 
 		document.getElementById("FilterPropertiesDict").onkeypress = function(event){
-			onEnterPressed(event, function(){
-									filterJsonDictUI('container_PropertiesDict', 
-															"counter_PropertiesDict", 
-															document.getElementById('FilterPropertiesDict').value, 
-															document.getElementById('caseSenstive_PropertiesDict').checked, 
-															document.getElementById('splitWords_PropertiesDict').checked);
-								});
+			onEnterPressed(event, filter_dict);
 		}
-		document.getElementById("but_FilterPropertiesDict").onclick = function(event){
-			filterJsonDictUI('container_PropertiesDict', 
-									"counter_PropertiesDict", 
-									document.getElementById('FilterPropertiesDict').value, 
-									document.getElementById('caseSenstive_PropertiesDict').checked, 
-									document.getElementById('splitWords_PropertiesDict').checked,
-									document.getElementById('FilterPropertiesAttribute').value);
+		document.getElementById("FilterPropertiesAttribute").onkeypress = function(event){
+			onEnterPressed(event, filter_dict);
 		}
+		document.getElementById("but_FilterPropertiesDict").onclick = filter_dict;
 		document.getElementById("but_updatePropDict").onclick = function(event){
 			refreshPropertyDictVue();
 		}

diff --git a/src/main/webapp/ressources/script/modules/energyml/JsonElementVue.js b/src/main/webapp/ressources/script/modules/energyml/JsonElementVue.js
@@ -95,7 +95,6 @@ export function addJsonData(jsObject, jsonEltVue, printListIdx, f_applyOnKey){
                     }
                 }
             }else{
-                spanTitle._object = jsObject[i];
                 if(spanTitle != null){
                     var boldSpan = document.createElement("b");
                     boldSpan.appendChild(spanTitle.firstChild);