Prepare to relase 6.1.1 (#897)

enketo · Jun 1, 2022 · e66fb8a · e66fb8a
1 parent 87c8492
commit e66fb8a
Show file tree

Hide file tree

Showing 7 changed files with 513 additions and 177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.1.1] - 2022-06-01
+
+-   Fix: rendering unexpected geopoint widget for setvalue actions within an input (#896)
+-   Fix: ensure evaluation cascade additions receive form context and update arguments (#895)
+
 ## [6.1.0] - 2022-05-17
 
 ##### Changed

diff --git a/docs/Form.html b/docs/Form.html
diff --git a/docs/global.html b/docs/global.html
@@ -2439,7 +2439,7 @@ <h4 class="name" id="ValidateInputResolution">ValidateInputResolution</h4>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_form.js.html">js/form.js</a>, <a href="js_form.js.html#line1270">line 1270</a>
+        <a href="js_form.js.html">js/form.js</a>, <a href="js_form.js.html#line1271">line 1271</a>
     </li></ul></dd>
 
 

diff --git a/docs/js_form.js.html b/docs/js_form.js.html
@@ -163,18 +163,19 @@ <h1 class="page-title">js/form.js</h1>
         const { evaluationCascadeAdditions } = this;
 
         if (evaluationCascadeAdditions.length > 0) {
-            baseEvaluationCascade.push(() => {
+            baseEvaluationCascade.push(function (...args) {
                 for (const fn of evaluationCascadeAdditions) {
-                    fn();
+                    fn.apply(this, args);
                 }
             });
         }
 
         if (config.experimentalOptimizations.computeAsync) {
             return baseEvaluationCascade.map(
                 (fn) =>
-                    (...args) =>
-                        callOnIdle(() => fn(...args))
+                    function (...args) {
+                        callOnIdle(() => fn.apply(this, args));
+                    }
             );
         }
 

diff --git a/docs/widget_geo_geopicker.js.html b/docs/widget_geo_geopicker.js.html
@@ -126,7 +126,7 @@ <h1 class="page-title">widget/geo/geopicker.js</h1>
      * @type {string}
      */
     static get selector() {
-        return '.question input[data-type-xml="geopoint"]:not([data-setgeopoint]), .question input[data-type-xml="geotrace"], .question input[data-type-xml="geoshape"]';
+        return ':is(.question input[data-type-xml="geopoint"], .question input[data-type-xml="geotrace"], .question input[data-type-xml="geoshape"]):not([data-setvalue], [data-setgeopoint])';
     }
 
     /**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "enketo-core",
     "description": "Extensible Enketo form engine",
     "homepage": "https://enketo.org",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "license": "Apache-2.0",
     "os": [
         "darwin",
@@ -65,10 +65,10 @@
         "eslint-plugin-jsdoc": "^36.1.1",
         "eslint-plugin-jsx-a11y": "^6.5.1",
         "eslint-plugin-prettier": "^4.0.0",
-        "eslint-plugin-react": "^7.29.4",
+        "eslint-plugin-react": "^7.30.0",
         "eslint-plugin-react-hooks": "^4.4.0",
         "eslint-plugin-unicorn": "^36.0.0",
-        "grunt": "^1.5.2",
+        "grunt": "^1.5.3",
         "grunt-concurrent": "^3.0.0",
         "grunt-contrib-connect": "^3.0.0",
         "grunt-contrib-watch": "^1.1.0",
@@ -79,7 +79,7 @@
         "grunt-shell": "^3.0.1",
         "jsdoc": "^3.6.10",
         "jsdoc-ts-utils": "^2.0.1",
-        "karma": "^6.3.19",
+        "karma": "^6.3.20",
         "karma-chrome-launcher": "^3.1.1",
         "karma-coverage": "^2.2.0",
         "karma-esbuild": "^2.2.4",