thecore_dataentry_commons 1.2.38 → 1.2.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f734122d8066520192a5116badd8141f87962db5
-  data.tar.gz: e211e3b441eba8bf71ea70c5eb4508efde5fe11b
+  metadata.gz: d9600f57a53a6d1e4bda2a70b1a44903f2130ee7
+  data.tar.gz: d90612165955a83290c2263298cd8e18be76d0a8
 SHA512:
-  metadata.gz: ead4fda01332f388c88c0ae68150f030e0af98ee1e2c9e1fadb9dec29af9d125d3595884e619a45a6d6f9de3b2fdf7cddf318273c14e1ad6e9f197deb53070b6
-  data.tar.gz: c7d22ce92b91e66a3a7cee117a42abdccf6f6ebe130f21d25a8fb505ff75ce3300303e23926b1d3af6a93bcae7f78e590f248874151998c86a12e6f9f54592b6
+  metadata.gz: 76658ccdd9471430aa0bcf47692ee1f906d6456bdefafd77183f041f6959dbeda79d4c34fab9fb1c577895bd6a6c595f2521663c32eca18676e30c63cdb040e1
+  data.tar.gz: 7b72664c1368810eaecc77537e9f75aa86a2ba983cdcdc14dffb01cc04c8b8b8f6104e13f61cfe0ca71395ecd208a75b515d691698c6fdb58285280f855fef00

data/app/views/higher_level/_barcode_simple_scan.html.erb

@@ -98,10 +98,10 @@
             parameters: additionalData
         }).then(barcodeScannedSuccess).done(barcodeScannedThen).fail(barcodeScannedFailure);
     }
-    <%-unless (start_disabled rescue false)%>
-    $('#send').on('click', sendFunction);
-    <%-else%>
+    <%-if (start_disabled rescue false)%>
     $('#send').off('click', sendFunction);
+    <%-else%>
+    $('#send').on('click', sendFunction);
     <%-end%>
 
     <%-unless (hide_action rescue true)%>

data/app/views/rails_admin/main/_kp.html.erb

@@ -39,12 +39,14 @@
   }
   function enableKSCapture(){
     console.log("Enabling keypress capture");
+    $(document).off(kpMode, manageScannedKeystrokes);
     $(document).on(kpMode, manageScannedKeystrokes);
     $("#barcode").off(kpMode, manageScannedKeystrokes);
   }
   function disableKSCapture(){
     console.log("Disabling keypress capture");
     $(document).off(kpMode, manageScannedKeystrokes);
+    $("#barcode").off(kpMode, manageScannedKeystrokes);
     $("#barcode").on(kpMode, manageScannedKeystrokes);
   }
 
@@ -62,9 +64,9 @@
   $("#barcode").off(kpMode);
   $("#barcode").focus();
   // Enabling keypress event only for this page
-  <%-unless (start_disabled rescue false)%>
-  startKSCapture();
-  <%-else%>
+  <%-if (start_disabled rescue false)%>
   disableKSCapture();
+  <%-else%>
+  startKSCapture();
   <%-end%>
 </script>

data/app/views/rails_admin/main/_ws.html.erb

@@ -81,7 +81,10 @@
     }
   }
 
-  <%-unless (start_disabled rescue false)%>
+  <%-if (start_disabled rescue false)%>
+  // Do nothing, if start is disabled is true, don't print anything.
+  // If it's not defined, it must default to starting websocket()
+  <%-else%>
   startWS();
   <%-end%>
 </script>

data/lib/thecore_dataentry_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreDataentryCommons
-  VERSION = '1.2.38'.freeze
+  VERSION = '1.2.39'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_dataentry_commons
 version: !ruby/object:Gem::Version
-  version: 1.2.38
+  version: 1.2.39
 platform: ruby
 authors:
 - Gabriele Tassoni