diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js index 7d1f730aea5ed1bec5bf78c795607a48b01c429b..7139863c118eb6452440d260178e86ea78ad8635 100644 --- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js +++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.js @@ -1,17 +1,19 @@ /*jslint nomen: true, maxlen: 200, indent: 2, unparam: true*/ /*global rJS, console, window, document, RSVP, btoa, atob, $, XMLSerializer, - jQuery, URI, vkbeautify, domsugar, Boolean */ + DOMParser, URI, vkbeautify, domsugar, Boolean */ -(function (window, document, rJS, $, XMLSerializer, jQuery, vkbeautify, +(function (window, document, rJS, $, XMLSerializer, DOMParser, vkbeautify, domsugar, Boolean) { "use strict"; var DISPLAY_JSON_FORM = 'display_json_form', - DISPLAY_RAW_XML = 'display_raw_xml'; + DISPLAY_RAW_XML = 'display_raw_xml', + domparser = new DOMParser; function jsonDictToParameterXML(json) { var parameter_id, - xml_output = $($.parseXML('<?xml version="1.0" encoding="UTF-8" ?><instance />')); + xml_output = $((new DOMParser).parseFromString( + '<?xml version="1.0" encoding="UTF-8" ?><instance />', 'text/xml')); // Used by serialisation XML for (parameter_id in json) { if (json.hasOwnProperty(parameter_id)) { @@ -28,8 +30,11 @@ } function jsonDictToParameterJSONInXML(json) { - var xml_output = $($.parseXML('<?xml version="1.0" encoding="UTF-8" ?><instance />')); - // Used by serialisation XML + var xml_output = $((new DOMParser).parseFromString( + '<?xml version="1.0" encoding="UTF-8" ?><instance />', + 'text/xml' + )); + // Used by serialisation XML $('instance', xml_output).append( $('<parameter />', xml_output) .text(vkbeautify.json(JSON.stringify(json))) @@ -861,15 +866,19 @@ if (parameter_xml !== undefined) { if (serialisation === "json-in-xml") { - parameter_list = jQuery.parseXML( - parameter_xml + parameter_list = (new DOMParser()).parseFromString( + parameter_xml, + 'text/xml' ).querySelectorAll("parameter"); + if (parameter_list.length > 1) { throw new Error("The current parameter should contains only _ parameter (json-in-xml)."); } - parameter_entry = jQuery.parseXML( - parameter_xml + parameter_entry = (new DOMParser()).parseFromString( + parameter_xml, + 'text/xml' ).querySelector("parameter[id='_']"); + if (parameter_entry !== null) { parameter_dict = JSON.parse(parameter_entry.textContent); } else if (parameter_list.length === 1) { @@ -878,14 +887,18 @@ ); } } else if (["", "xml"].indexOf(serialisation) >= 0) { - parameter_entry = jQuery.parseXML( - parameter_xml + parameter_entry = (new DOMParser()).parseFromString( + parameter_xml, + 'text/xml' ).querySelector("parameter[id='_']"); + if (parameter_entry !== null) { throw new Error("The current parameter values should NOT contains _ parameter (xml)."); } - $(jQuery.parseXML(parameter_xml) - .querySelectorAll("parameter")) + $((new DOMParser()).parseFromString( + parameter_xml, + 'text/xml' + ).querySelectorAll("parameter")) .each(function (key, p) { parameter_dict[p.id] = p.textContent; }); @@ -921,9 +934,8 @@ } for (i = 0; i < label_list.length; i = i + 1) { - $(label_list[i]).addClass("slapos-parameter-dict-key-colapse"); + label_list[i].classList.add("slapos-parameter-dict-key-colapse"); } - return gadget.getContent(); }) .fail(function (error) { @@ -1102,5 +1114,5 @@ }); }, {mutex: 'statechange'}); -}(window, document, rJS, $, XMLSerializer, jQuery, vkbeautify, +}(window, document, rJS, $, XMLSerializer, DOMParser, vkbeautify, domsugar, Boolean)); \ No newline at end of file diff --git a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml index b49016eccb86d26d1d11dd2fd5a02862d412d42c..437a406bd316189944dcb2982713c8e36333b828 100644 --- a/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml +++ b/master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_parameter_form_js.xml @@ -280,7 +280,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>1003.49163.51970.27118</string> </value> + <value> <string>1003.60531.19628.1092</string> </value> </item> <item> <key> <string>state</string> </key> @@ -298,7 +298,7 @@ </tuple> <state> <tuple> - <float>1666206917.22</float> + <float>1666889520.35</float> <string>UTC</string> </tuple> </state>