pywebexec 2.2.7__py3-none-any.whl → 2.2.9__py3-none-any.whl

pywebexec/static/js/schemaform.js

@@ -92,18 +92,19 @@ function convertTextareaToArray(values, formDesc, schema) {
   return values;
 }
 
-function validateSchemaForm(form, formDesc, schema, values) {
-  err = form.querySelector('.alert');
-  err.style.display = 'none';
-  convertTextareaToArray(values, formDesc, schema);
+function validateSchemaForm(form, formDesc, schema, values, schemaName) {
+  schemaValues[schemaName] = convertTextareaToArray(values, formDesc, schema);
+  localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
   env = JSV.createEnvironment();
   report = env.validate(values, schema);
   errors = report.errors;
+  err = form.querySelector('.alert');
   if (errors.length > 0) {
     err.innerText = errors[0].uri.split('#')[1].slice(1).replaceAll('/', '.') + ': ' + errors[0].message + ': ' + errors[0].details;
     err.style.display = 'block';
     return false;
   }
+  err.style.display = 'none';
   return true;
 }
 function createSchemaForm($form, schema, onSubmit, schemaName) {
@@ -230,7 +231,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   jsform = $form.jsonForm({
     schema: schema,
     onSubmit: function (errors, values) {
-      if (! validateSchemaForm(event.target, formDesc, schema, values)) {
+      if (! validateSchemaForm(event.target, formDesc, schema, values, schemaName)) {
         event.preventDefault();
         event.stopPropagation();
         event.stopImmediatePropagation();
@@ -250,7 +251,7 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
   err.classList.add('alert');
   err.style.display = 'none';
   schemaForm.appendChild(err);
-  validateSchemaForm(schemaForm, formDesc, schema, value);
+  validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName);
   schemaForm.querySelectorAll('textarea').forEach(txt => {
     txt.style.height = "0";  
     setTimeout(() => adjustTxtHeight(txt), 1);
@@ -258,15 +259,11 @@ function createSchemaForm($form, schema, onSubmit, schemaName) {
     txt.addEventListener("input", () => adjustTxtHeight(txt));
   });
   schemaForm.addEventListener('input', (e) => {
-    schemaValues[schemaName] = convertTextareaToArray(jsform.root.getFormValues(), formDesc, schema);
-    localStorage.setItem('schemaValues', JSON.stringify(schemaValues));
+    validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues(), schemaName);
     if (e.target.tagName === 'INPUT' && e.target.type === 'text') {
       adjustInputWidth(e.target);
     }
   });
-  schemaForm.addEventListener('change', (e) => {
-    validateSchemaForm(schemaForm, formDesc, schema, jsform.root.getFormValues());
-  });
   formInputHandle();
   return jsform;
 }

pywebexec/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.2.7'
-__version_tuple__ = version_tuple = (2, 2, 7)
+__version__ = version = '2.2.9'
+__version_tuple__ = version_tuple = (2, 2, 9)

{pywebexec-2.2.7.dist-info → pywebexec-2.2.9.dist-info}/METADATA

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

{pywebexec-2.2.7.dist-info → pywebexec-2.2.9.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=B6GrE_H3HdW5bYR7WQrOTlC8LfCumdx9DeJs14u4q5A,511
+pywebexec/version.py,sha256=vfAUNhf_nRXyidROZBr9-mByYfQRM-Vg2szu6KEhvHY,511
 pywebexec/static/css/form.css,sha256=XC_0ES5yMHYz0S2OHR0RAboQN7fBUmg5ZIq8Qm5rHP0,5806
 pywebexec/static/css/markdown.css,sha256=br4-iK9wigTs54N2KHtjgZ4KLH0THVSvJo-XZAdMHiE,1970
 pywebexec/static/css/style.css,sha256=R1VOPNV2ztROKy9Fgf3tvUrtuKagY027tFJ8C866yWU,9991
@@ -35,7 +35,7 @@ pywebexec/static/images/success.svg,sha256=NVwezvVMplt46ElW798vqGfrL21Mw_DWHUp_q
 pywebexec/static/images/swagger-ui.svg,sha256=FR0yeOVwe4zCYKZAjCGcT_m0Mf25NexIVaSXifIkoU0,2117
 pywebexec/static/js/executables.js,sha256=jB4QqWi4Qeq1uJflTSqqjsZy-ec9iy5ZmFvfNWMzXq4,11913
 pywebexec/static/js/popup.js,sha256=O3DEWnyb5yGW9tjODYycc-ujWndyAfnJMxulaQeogtc,9700
-pywebexec/static/js/schemaform.js,sha256=7ktVteMY3v84iqHmT-N65Ee_rMyA6SitoYi8CN-HYDY,9686
+pywebexec/static/js/schemaform.js,sha256=NlFXFKJI53izxPXct3a5XiB1RhWGt0_EIp6o1HfsryU,9624
 pywebexec/static/js/script.js,sha256=yQP2dWwTObWbg6ROeKFxwYi1NfDd2gxEn2e3oL-FWL8,18379
 pywebexec/static/js/swagger-form.js,sha256=CLcSHMhk5P4-_2MIRBoJLgEnIj_9keDDSzUugXHZjio,4565
 pywebexec/static/js/js-yaml/LICENSE,sha256=oHvCRGi5ZUznalR9R6LbKC0HcztxXbTHOpi9Y5YflVA,1084
@@ -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=MAPr-z96VERAecDvX37V8q2Nxph-O0fNDBul1x2w9SI,1147
-pywebexec-2.2.7.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-pywebexec-2.2.7.dist-info/METADATA,sha256=6vJc9lg90rSQ7DfhHKoZwD1ncnyIGQ2Qk0yzNtewzD0,12832
-pywebexec-2.2.7.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-pywebexec-2.2.7.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
-pywebexec-2.2.7.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
-pywebexec-2.2.7.dist-info/RECORD,,
+pywebexec-2.2.9.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+pywebexec-2.2.9.dist-info/METADATA,sha256=1a8pUASu6I7njLd3y1krziCRCMjotkdEG3NXGjzbgOA,12832
+pywebexec-2.2.9.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+pywebexec-2.2.9.dist-info/entry_points.txt,sha256=l52GBkPCXRkmlHfEyoVauyfBdg8o-CAtC8qQpOIjJK0,55
+pywebexec-2.2.9.dist-info/top_level.txt,sha256=vHoHyzngrfGdm_nM7Xn_5iLmaCrf10XO1EhldgNLEQ8,10
+pywebexec-2.2.9.dist-info/RECORD,,