Merge branch 'develop' into main

NCEAS · Feb 3, 2022 · cf2cfed · cf2cfed
2 parents d870680 + d37d90a
commit cf2cfed
Show file tree

Hide file tree

Showing 8 changed files with 237 additions and 154 deletions.
diff --git a/docs/docs/AppConfig.html b/docs/docs/AppConfig.html
diff --git a/docs/docs/AppModel.html b/docs/docs/AppModel.html
@@ -324,7 +324,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2110">line 2110</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2113">line 2113</a>
     </li></ul></dd>
 
 
@@ -418,7 +418,7 @@ <h4 class="name" id="getActiveAltRepo">
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2053">line 2053</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2056">line 2056</a>
     </li></ul></dd>
 
 
@@ -591,7 +591,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line1981">line 1981</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line1984">line 1984</a>
     </li></ul></dd>
 
 
@@ -755,7 +755,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2138">line 2138</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2141">line 2141</a>
     </li></ul></dd>
 
 
@@ -851,7 +851,7 @@ <h4 class="name" id="setActiveAltRepo">
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2075">line 2075</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line2078">line 2078</a>
     </li></ul></dd>
 
 

diff --git a/docs/docs/EML211EditorView.html b/docs/docs/EML211EditorView.html
@@ -2720,7 +2720,7 @@ <h4 class="name" id="getRequiredFields">
 
 <div class="description">
     Gets the EML required fields, as configured in the <a href="AppConfig.html#emlEditorRequiredFields">AppConfig#emlEditorRequiredFields</a>, and adds
-possible other special fields that may be configured elsewhere. (e.g. the AppConfig#customEMLMethods)
+possible other special fields that may be configured elsewhere. (e.g. the <a href="AppConfig.html#customEMLMethods">AppConfig#customEMLMethods</a>)
 </div>
 
 

diff --git a/docs/docs/EMLMethodStep.html b/docs/docs/EMLMethodStep.html
@@ -383,7 +383,7 @@ <h5 class="subsection-title">Properties:</h5>
 
 
 
-            <td class="description last">A unique identifier for this Custom Method Step type, which is defined in AppConfig#customEMLMethods</td>
+            <td class="description last">A unique identifier for this Custom Method Step type, which is defined in <a href="AppConfig.html#customEMLMethods">AppConfig#customEMLMethods</a></td>
         </tr>
 
 

diff --git a/docs/docs/EMLMethods.html b/docs/docs/EMLMethods.html
@@ -737,7 +737,7 @@ <h4 class="name" id="getCustomSteps">
 
 
 <div class="description">
-    Returns the EMLMethodSteps that are custom methods, as configured in AppConfig#customEMLMethods
+    Returns the EMLMethodSteps that are custom methods, as configured in <a href="AppConfig.html#customEMLMethods">AppConfig#customEMLMethods</a>
 </div>
 
 
@@ -852,7 +852,7 @@ <h4 class="name" id="getNonCustomSteps">
 
 
 <div class="description">
-    Returns the EMLMethodSteps that are not custom methods, as configured in AppConfig#customEMLMethods
+    Returns the EMLMethodSteps that are not custom methods, as configured in <a href="AppConfig.html#customEMLMethods">AppConfig#customEMLMethods</a>
 </div>
 
 

diff --git a/docs/docs/global.html b/docs/docs/global.html
@@ -221,9 +221,10 @@ <h4 class="name" id="AdditionalField">
 
 
 <div class="description">
-    An additional field object contains the properties an additional query field to
-add that are required to render it correctly. An additional query field is one
-that does not actually exist in the query service index.
+    An additional field object contains the properties for an additional query
+field to add to the QueryFieldSelectView that are required to render it
+correctly. An additional query field is one that does not actually exist in the
+query service index.
 </div>
 
 
@@ -396,9 +397,6 @@ <h5 class="subsection-title">Properties:</h5>
 
 
 
-    <dt class="tag-since">Since:</dt>
-    <dd class="tag-since"><ul class="dummy"><li>2.15.0</li></ul></dd>
-
 
 
 
@@ -423,7 +421,7 @@ <h5 class="subsection-title">Properties:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_views_searchSelect_QueryFieldSelectView.js.html">src/js/views/searchSelect/QueryFieldSelectView.js</a>, <a href="src_js_views_searchSelect_QueryFieldSelectView.js.html#line60">line 60</a>
+        <a href="src_js_views_filters_FilterEditorView.js.html">src/js/views/filters/FilterEditorView.js</a>, <a href="src_js_views_filters_FilterEditorView.js.html#line179">line 179</a>
     </li></ul></dd>
 
 
@@ -453,10 +451,9 @@ <h4 class="name" id="AdditionalField">
 
 
 <div class="description">
-    An additional field object contains the properties for an additional query
-field to add to the QueryFieldSelectView that are required to render it
-correctly. An additional query field is one that does not actually exist in the
-query service index.
+    An additional field object contains the properties an additional query field to
+add that are required to render it correctly. An additional query field is one
+that does not actually exist in the query service index.
 </div>
 
 
@@ -629,6 +626,9 @@ <h5 class="subsection-title">Properties:</h5>
 
 
 
+    <dt class="tag-since">Since:</dt>
+    <dd class="tag-since"><ul class="dummy"><li>2.15.0</li></ul></dd>
+
 
 
 
@@ -653,7 +653,7 @@ <h5 class="subsection-title">Properties:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_views_filters_FilterEditorView.js.html">src/js/views/filters/FilterEditorView.js</a>, <a href="src_js_views_filters_FilterEditorView.js.html#line179">line 179</a>
+        <a href="src_js_views_searchSelect_QueryFieldSelectView.js.html">src/js/views/searchSelect/QueryFieldSelectView.js</a>, <a href="src_js_views_searchSelect_QueryFieldSelectView.js.html#line60">line 60</a>
     </li></ul></dd>
 
 
@@ -1129,7 +1129,7 @@ <h5>Type:</h5>
     <ul>
         <li>
 
-<span class="param-type">Array.&lt;object></span>
+<span class="param-type">object</span>
 
 
         </li>
@@ -2701,7 +2701,7 @@ <h5 class="subsection-title">Properties:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line1480">line 1480</a>
+        <a href="src_js_models_AppModel.js.html">src/js/models/AppModel.js</a>, <a href="src_js_models_AppModel.js.html#line1483">line 1483</a>
     </li></ul></dd>
 
 

diff --git a/docs/docs/src_js_models_AppModel.js.html b/docs/docs/src_js_models_AppModel.js.html
@@ -486,7 +486,6 @@ <h1 class="page-title">Source: src/js/models/AppModel.js</h1>
       * are serialized to the EML as regular method steps, but with an unchangeable title, defined here,
       * in order to identify them.
       *
-      * @type {object[]}
       * @typedef {object} CustomEMLMethod
       * @property {string[]} titleOptions One or more titles that may exist in an EML Method Step that identify that Method Step as a custom method type. THe first title in the array is serialized to the EML XML.
       * @property {string} id A unique identifier for this custom method type.
@@ -498,6 +497,10 @@ <h1 class="page-title">Source: src/js/models/AppModel.js</h1>
                   }]
       * @since 2.19.0
       */
+      /**
+      * @type {CustomEMLMethod}
+      * @since 2.19.0
+      */
       customEMLMethods: [],
 
       /**

diff --git a/src/js/models/AppModel.js b/src/js/models/AppModel.js
@@ -440,7 +440,6 @@ define(['jquery', 'underscore', 'backbone'],
       * are serialized to the EML as regular method steps, but with an unchangeable title, defined here,
       * in order to identify them.
       *
-      * @type {object[]}
       * @typedef {object} CustomEMLMethod
       * @property {string[]} titleOptions One or more titles that may exist in an EML Method Step that identify that Method Step as a custom method type. THe first title in the array is serialized to the EML XML.
       * @property {string} id A unique identifier for this custom method type.
@@ -452,6 +451,10 @@ define(['jquery', 'underscore', 'backbone'],
                   }]
       * @since 2.19.0
       */
+      /**
+      * @type {CustomEMLMethod}
+      * @since 2.19.0
+      */
       customEMLMethods: [],
 
       /**