Prepare v6.1.2 release (#911)

enketo · Jun 27, 2022 · 4f1426a · 4f1426a
1 parent e80306a
commit 4f1426a
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.1.2] - 2022-06-24
+
+-   Update meta selector used when setting deprecatedID (#900)
+-   Preserve geopicker zoom, center map on user location on load, no error clicking pin (#905)
+-   Don't use removed repeat instance as context for relevance (#909)
+
 ## [6.1.1] - 2022-06-01
 
 -   Fix: rendering unexpected geopoint widget for setvalue actions within an input (#896)

diff --git a/docs/Geopicker.html b/docs/Geopicker.html
@@ -411,7 +411,7 @@ <h4 class="name" id="props"><span class="type-signature"></span>props<span class
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1499">line 1499</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1508">line 1508</a>
     </li></ul></dd>
 
 
@@ -557,7 +557,7 @@ <h4 class="name" id="value"><span class="type-signature"></span>value<span class
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1520">line 1520</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1529">line 1529</a>
     </li></ul></dd>
 
 
@@ -882,7 +882,7 @@ <h4 class="name" id="_addDynamicMap"><span class="type-signature"></span>_addDyn
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line793">line 793</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line792">line 792</a>
     </li></ul></dd>
 
 
@@ -987,7 +987,7 @@ <h4 class="name" id="_addPoint"><span class="type-signature"></span>_addPoint<sp
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1270">line 1270</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1279">line 1279</a>
     </li></ul></dd>
 
 
@@ -1296,7 +1296,7 @@ <h4 class="name" id="_closePolygon"><span class="type-signature"></span>_closePo
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1316">line 1316</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1325">line 1325</a>
     </li></ul></dd>
 
 
@@ -1383,7 +1383,7 @@ <h4 class="name" id="_convertKmlCoordinatesToLeafletCoordinates"><span class="ty
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1385">line 1385</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1394">line 1394</a>
     </li></ul></dd>
 
 
@@ -1649,7 +1649,7 @@ <h4 class="name" id="_editPoint"><span class="type-signature"></span>_editPoint<
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1283">line 1283</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1292">line 1292</a>
     </li></ul></dd>
 
 
@@ -1985,7 +1985,7 @@ <h4 class="name" id="_getBaseLayers"><span class="type-signature"></span>_getBas
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1043">line 1043</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1052">line 1052</a>
     </li></ul></dd>
 
 
@@ -2139,7 +2139,7 @@ <h4 class="name" id="_getDefaultLayer"><span class="type-signature"></span>_getD
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1024">line 1024</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1033">line 1033</a>
     </li></ul></dd>
 
 
@@ -2293,7 +2293,7 @@ <h4 class="name" id="_getGoogleTileLayer"><span class="type-signature"></span>_g
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line960">line 960</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line969">line 969</a>
     </li></ul></dd>
 
 
@@ -2474,7 +2474,7 @@ <h4 class="name" id="_getLayers"><span class="type-signature"></span>_getLayers<
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line908">line 908</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line917">line 917</a>
     </li></ul></dd>
 
 
@@ -2583,7 +2583,7 @@ <h4 class="name" id="_getLeafletTileLayer"><span class="type-signature"></span>_
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line938">line 938</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line947">line 947</a>
     </li></ul></dd>
 
 
@@ -2878,7 +2878,7 @@ <h4 class="name" id="_getTileOptions"><span class="type-signature"></span>_getTi
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line977">line 977</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line986">line 986</a>
     </li></ul></dd>
 
 
@@ -3735,7 +3735,7 @@ <h4 class="name" id="_loadGoogleMapsScript"><span class="type-signature"></span>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line995">line 995</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1004">line 1004</a>
     </li></ul></dd>
 
 
@@ -4068,7 +4068,7 @@ <h4 class="name" id="_removePoint"><span class="type-signature"></span>_removePo
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1300">line 1300</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1309">line 1309</a>
     </li></ul></dd>
 
 
@@ -4291,7 +4291,7 @@ <h4 class="name" id="_showIntersectError"><span class="type-signature"></span>_s
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line899">line 899</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line908">line 908</a>
     </li></ul></dd>
 
 
@@ -4510,7 +4510,7 @@ <h4 class="name" id="_updateArea"><span class="type-signature"></span>_updateAre
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1244">line 1244</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1253">line 1253</a>
     </li></ul></dd>
 
 
@@ -4646,7 +4646,7 @@ <h4 class="name" id="_updateDynamicMapView"><span class="type-signature"></span>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line877">line 877</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line886">line 886</a>
     </li></ul></dd>
 
 
@@ -4824,7 +4824,7 @@ <h4 class="name" id="_updateInputs"><span class="type-signature"></span>_updateI
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1362">line 1362</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1371">line 1371</a>
     </li></ul></dd>
 
 
@@ -5189,7 +5189,7 @@ <h4 class="name" id="_updateMarkers"><span class="type-signature"></span>_update
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1056">line 1056</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1065">line 1065</a>
     </li></ul></dd>
 
 
@@ -5276,7 +5276,7 @@ <h4 class="name" id="_updatePolygon"><span class="type-signature"></span>_update
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1208">line 1208</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1217">line 1217</a>
     </li></ul></dd>
 
 
@@ -5364,7 +5364,7 @@ <h4 class="name" id="_updatePolyline"><span class="type-signature"></span>_updat
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1150">line 1150</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1159">line 1159</a>
     </li></ul></dd>
 
 
@@ -5560,7 +5560,7 @@ <h4 class="name" id="containsEmptyPoints"><span class="type-signature"></span>co
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1488">line 1488</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1497">line 1497</a>
     </li></ul></dd>
 
 
@@ -5761,7 +5761,7 @@ <h4 class="name" id="disable"><span class="type-signature"></span>disable<span c
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1602">line 1602</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1611">line 1611</a>
     </li></ul></dd>
 
 
@@ -5853,7 +5853,7 @@ <h4 class="name" id="enable"><span class="type-signature"></span>enable<span cla
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1581">line 1581</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1590">line 1590</a>
     </li></ul></dd>
 
 
@@ -5945,7 +5945,7 @@ <h4 class="name" id="update"><span class="type-signature"></span>update<span cla
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1618">line 1618</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1627">line 1627</a>
     </li></ul></dd>
 
 
@@ -6037,7 +6037,7 @@ <h4 class="name" id="updatedPolylineWouldIntersect"><span class="type-signature"
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1422">line 1422</a>
+        <a href="widget_geo_geopicker.js.html">widget/geo/geopicker.js</a>, <a href="widget_geo_geopicker.js.html#line1431">line 1431</a>
     </li></ul></dd>
 
 

diff --git a/docs/Nodeset.html b/docs/Nodeset.html
@@ -342,7 +342,7 @@ <h4 class="name" id="convert"><span class="type-signature"></span>convert<span c
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line282">line 282</a>
+        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line283">line 283</a>
     </li></ul></dd>
 
 
@@ -981,7 +981,7 @@ <h4 class="name" id="isRequired"><span class="type-signature"></span>isRequired<
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line388">line 388</a>
+        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line389">line 389</a>
     </li></ul></dd>
 
 
@@ -1592,7 +1592,7 @@ <h4 class="name" id="validate"><span class="type-signature"></span>validate<span
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line304">line 304</a>
+        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line305">line 305</a>
     </li></ul></dd>
 
 
@@ -1792,7 +1792,7 @@ <h4 class="name" id="validateConstraintAndType"><span class="type-signature"></s
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line335">line 335</a>
+        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line336">line 336</a>
     </li></ul></dd>
 
 
@@ -1995,7 +1995,7 @@ <h4 class="name" id="validateRequired"><span class="type-signature"></span>valid
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line406">line 406</a>
+        <a href="js_nodeset.js.html">js/nodeset.js</a>, <a href="js_nodeset.js.html#line407">line 407</a>
     </li></ul></dd>
 
 

diff --git a/docs/js_form-model.js.html b/docs/js_form-model.js.html
@@ -709,7 +709,7 @@ <h1 class="page-title">js/form-model.js</h1>
                 'text/xml'
             ).documentElement;
             this.xml.adoptNode(deprecatedIdEl);
-            metaEl = this.xml.querySelector('* > meta');
+            metaEl = this.xml.querySelector('instance > * > meta');
             metaEl.appendChild(deprecatedIdEl);
         }
     }

diff --git a/docs/js_nodeset.js.html b/docs/js_nodeset.js.html
@@ -295,6 +295,7 @@ <h1 class="page-title">js/nodeset.js</h1>
                 nodes: null,
                 repeatPath,
                 repeatIndex,
+                removed: true, // Introduced to handle relevance on model nodes with no form controls (calculates)
             })
         );
 

diff --git a/docs/js_relevant.js.html b/docs/js_relevant.js.html
@@ -252,8 +252,16 @@ <h1 class="page-title">js/relevant.js</h1>
              */
             let context = p.path;
             if (
-                getChild(node, `.or-repeat-info[data-name="${p.path}"]`) &amp;&amp;
-                !getChild(node, `.or-repeat[name="${p.path}"]`)
+                (getChild(node, `.or-repeat-info[data-name="${p.path}"]`) &amp;&amp;
+                    !getChild(node, `.or-repeat[name="${p.path}"]`)) ||
+                // Special cases below for model nodes with no visible form control: if repeat instance removed or if
+                // no instances at all (e.g. during load with `jr:count="0"`)
+                (insideRepeat &amp;&amp;
+                    repeatParent == null &amp;&amp;
+                    (options.removed ||
+                        this.form.view.html.querySelector(
+                            `.or-repeat[name="${CSS.escape(repeatPath)}"]`
+                        ) == null))
             ) {
                 context = null;
             }