pywebexec 2.2.2__py3-none-any.whl → 2.2.4__py3-none-any.whl

pywebexec/static/css/form.css

@@ -140,10 +140,10 @@
   li {
     display: flex;
   }
-  input, select {
+  .controls input, select {
     min-width: unset;
     max-width: unset;
-    width: auto;
+    width: 110px;
     margin: 0;
   }
   input[type="number"] {

pywebexec/static/js/executables.js

@@ -259,9 +259,6 @@ async function fetchExecutables() {
 paramsInput.addEventListener('focus', () => {
     const currentCmd = commandInput.value;
     paramsInput.name = currentCmd;
-    if (paramsContainer.style.display == 'none') {
-        $('#schemaForm').html('');
-    }
     if (gExecutables[currentCmd] && gExecutables[currentCmd].schema && gExecutables[currentCmd].schema.properties && paramsContainer.style.display == 'none') {
         createSchemaForm($('#schemaForm'), gExecutables[currentCmd].schema, async function (errors, values) {
             const commandName = commandInput.value;

pywebexec/static/js/schemaform.js

@@ -1,4 +1,7 @@
 function adjustInputWidth(input) {
+  if (!input.getAttribute('size')) {
+    input.setAttribute('size', 9);
+  }
   input.style.width = 'auto';
   if (input.type === 'number') {
     delta = 30;
@@ -10,24 +13,20 @@ function adjustInputWidth(input) {
 
 function formInputHandle() {
   schemaForm.querySelectorAll('input[type="text"], input[type="number"]').forEach(input => {
-    if (! inputHandlers.includes(input)) {
-      val = input.placeholder;
-      if (val) {
-        size = Math.max(val.length, 2)
-        if (input.type== 'number') {
-          size += 2;
-        }
-      } else {
-        size = 12;
+    val = input.placeholder;
+    if (val) {
+      size = Math.max(val.length, 2)
+      if (input.type== 'number') {
+        size += 2;
       }
-      if (input.value) {
-        size = 2;
-      }
-      input.setAttribute('size', size);
-      setTimeout(() => adjustInputWidth(input), 1);
-      input.addEventListener('input', () => adjustInputWidth(input));
-      inputHandlers.push(input);
+    } else {
+      size = 12;
+    }
+    if (input.value) {
+      size = 2;
     }
+    input.setAttribute('size', size);
+    setTimeout(() => adjustInputWidth(input), 1);
   });
 }
 
@@ -95,7 +94,7 @@ function convertTextareaToArray(values, formDesc, schema) {
 
 // ...existing code...
 
-function createSchemaForm(form, schema, onSubmit, schemaName) {
+function createSchemaForm($form, schema, onSubmit, schemaName) {
   if (schema && schema.schema_options) {
     schema_options = schema.schema_options;
   } else {
@@ -142,8 +141,14 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
   } else {
     value = {};
   }
-
-  schemaForm = form[0];
+  // recreate form to remove event listeners
+  $form.off();
+  $form.empty();
+  $form.html('');
+  $newform = $form.clone();
+  $form.replaceWith($newform);
+  $form = $newform;
+  schemaForm = $form[0];
   if (onSubmit != null) {
     if (schema_options && schema_options.batch_param) {
       schema.properties[schema_options.batch_param].required = true;
@@ -209,8 +214,8 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
       }
     }
   }
-  form[0].classList.add('form-inline');
-  jsform = form.jsonForm({
+  schemaForm.classList.add('form-inline');
+  jsform = $form.jsonForm({
     schema: schema,
     onSubmit: function (errors, values) {
       convertTextareaToArray(values, formDesc, schema);
@@ -230,23 +235,21 @@ function createSchemaForm(form, schema, onSubmit, schemaName) {
     //     fieldHtmlClass: "input-small",
     // }
   });
-  form[0].firstChild.classList.add('form-inline');
-  form[0].querySelectorAll('._jsonform-array-addmore').forEach(btn => {
-    btn.addEventListener('click', formInputHandle);
-  });
-  formInputHandle();
-
-  form[0].querySelectorAll('textarea').forEach(txt => {
+  schemaForm.firstChild.classList.add('form-inline');
+  schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";  
     setTimeout(() => adjustTxtHeight(txt), 1);
     txt.setAttribute("spellcheck", "false");
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
-  form[0].addEventListener('input', () => {
+  schemaForm.addEventListener('input', (e) => {
     schemaValues[schemaName] = convertTextareaToArray(jsform.root.getFormValues(), formDesc, schema);
     localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+    if (e.target.tagName === 'INPUT' && e.target.type === 'text') {
+      adjustInputWidth(e.target);
+    }
   });
-  
+  formInputHandle();
   return jsform;
 }
 function adjustTxtHeight(txt) {
@@ -288,7 +291,7 @@ async function getPostParametersSchema() {
 }
 
 let schemaForm;
-let inputHandlers = [];
+// let inputHandlers = [];
 let schemaValues = JSON.parse(localStorage.getItem('schemaValues')) || {};
 
 

pywebexec/static/js/swagger-form.js

@@ -107,12 +107,12 @@ window.onload = function() {
             const form = document.createElement("form");
             form.id = routePathId;
             form.classList.add("schema-form");
+            paramtext.parentNode.insertBefore(form, paramtext.nextSibling);
             jsform = createSchemaForm($(form), swaggerSchemas[routePath], null, routePath);
-            // form.addEventListener("input", formInput(node, jsform));
+            newForm = jsform.root.ownerTree.domRoot;
             setTimeout(() => addFormInputListener(paramtext, jsform)(), 100);
-            form.addEventListener("input", addFormInputListener(paramtext, jsform));
-            paramtext.parentNode.insertBefore(form, paramtext.nextSibling);
-            item1 = form.querySelector("input, select, textarea");
+            newForm.addEventListener("input", addFormInputListener(paramtext, jsform));
+            item1 = newForm.querySelector("input, select, textarea");
             if (item1) {
               item1.focus();
             }

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.2'
-__version_tuple__ = version_tuple = (2, 2, 2)
+__version__ = version = '2.2.4'
+__version_tuple__ = version_tuple = (2, 2, 4)

{pywebexec-2.2.2.dist-info → pywebexec-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pywebexec
-Version: 2.2.2
+Version: 2.2.4
 Summary: Simple Python HTTP Exec Server
 Home-page: https://github.com/joknarf/pywebexec
 Author: Franck Jouvanceau

{pywebexec-2.2.2.dist-info → pywebexec-2.2.4.dist-info}/RECORD

@@ -2,8 +2,8 @@ pywebexec/__init__.py,sha256=197fHJy0UDBwTTpGCGortZRr-w2kTaD7MxqdbVmTEi0,61
 pywebexec/host_ip.py,sha256=Ud_HTflWVQ8789aoQ2RZdT1wGI-ccvrwSWGz_c7T3TI,1241
 pywebexec/pywebexec.py,sha256=R-jp9BiUMJZW7m9N9kQC6dpIueUgFVDo4n9_GFb1rOs,45734
 pywebexec/swagger.yaml,sha256=I_oLpp7Hqel8SDEEykvpmCT-Gv3ytGlziq9bvQOrtZY,7598
-pywebexec/version.py,sha256=YDBduKhVnvbZfZTbXbsjQMbxTwgIIXIZ646Mj9YV074,511
-pywebexec/static/css/form.css,sha256=HnQ4A7QSQu1lC6P8h4hGpUMtOXujNg8SR1_qteu7oDk,5487
+pywebexec/version.py,sha256=Ath1yNFbHtPzluPba0J7EfQTfLH_byRzLfGjqAUl6cY,511
+pywebexec/static/css/form.css,sha256=R61CysMe2QqRHe3uxamkK29-pnm23y4Ekl3pZIVgPKQ,5498
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=R1VOPNV2ztROKy9Fgf3tvUrtuKagY027tFJ8C866yWU,9991
 pywebexec/static/css/swagger-ui.css,sha256=xhXN8fnUaIACGHuPIEIr9-qmyYr6Zx0k2wv4Qy7Bg1Y,154985
@@ -33,11 +33,11 @@ pywebexec/static/images/resume.svg,sha256=99LP1Ya2JXakRCO9kW8JMuT_4a_CannF65Eiuw
 pywebexec/static/images/running.svg,sha256=fBCYwYb2O9K4N3waC2nURP25NRwZlqR4PbDZy6JQMww,610
 pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_qiD_FU8,489
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
-pywebexec/static/js/executables.js,sha256=lF9Icb4VzbxSCTmcz-TUjvFKQ_ygmSgPq0Q_uaTRR-g,11866
+pywebexec/static/js/executables.js,sha256=_Deyx1O8QyiFt6RcmaXnC9Vx9yagTQP4Vhz9GAXFR84,11774
 pywebexec/static/js/popup.js,sha256=O3DEWnyb5yGW9tjODYycc-ujWndyAfnJMxulaQeogtc,9700
-pywebexec/static/js/schemaform.js,sha256=NLMAnS2GpyhGp286HUBqQXJAAQaqFMtJ03rGVrh8JaM,8856
+pywebexec/static/js/schemaform.js,sha256=2kjdaquoIdh0hAuAuZdI0cqM5URPWslZtbYHAjtG1_4,8918
 pywebexec/static/js/script.js,sha256=X5TN2q1m6ZGPK72e1MWgyQWk1agOrcOWuGdwVWB9HJk,18204
-pywebexec/static/js/swagger-form.js,sha256=EYXqHIE105DkXPCPi5-eYzux9nPLmJuisf-5EwFypsQ,4578
+pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
 pywebexec/static/js/js-yaml/js-yaml.min.js,sha256=Rdw90D3AegZwWiwpibjH9wkBPwS9U4bjJ51ORH8H69c,39430
 pywebexec/static/js/marked/LICENSE.md,sha256=jjo_gvWaYJWPVsoI9EVkfDKkcz3HymwsRvbriYRxq5w,2942
@@ -67,9 +67,9 @@ pywebexec/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 pywebexec/templates/index.html,sha256=w18O2plH_yS8bqlPsu5hwFFmCj9H2hWLSV8B6ADcSwU,3900
 pywebexec/templates/popup.html,sha256=3kpMccKD_OLLhJ4Y9KRw6Ny8wQWjVaRrUfV9y5-bDiQ,1580
 pywebexec/templates/swagger_ui.html,sha256=9ngyldkyEdLonBjl97mbIZUlVk-jxwcHrvFzMSrveyU,1067
-pywebexec-2.2.2.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.2.2.dist-info/METADATA,sha256=6wl5EJ2M1Oww4Pn6Pu5wRAIqf0cHv6DixTl4jv5ICf4,12832
-pywebexec-2.2.2.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-pywebexec-2.2.2.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.2.2.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.2.2.dist-info/RECORD,,
+pywebexec-2.2.4.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.2.4.dist-info/METADATA,sha256=9jESgXsDGpYA9ZW1RIN4k7fy5vbTGdr4ZVRFnz48X8M,12832
+pywebexec-2.2.4.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
+pywebexec-2.2.4.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.2.4.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.2.4.dist-info/RECORD,,