Bump version, update CHANGES, bundle as 1.2.4

Juris-M · May 23, 2019 · 90614d6 · 90614d6
1 parent 01eda3b
commit 90614d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,11 @@
 Summary of changes to citeproc-js since version 1.2 release.
 
+========================
+Changes in version 1.2.4
+========================
+
+- Fix bug in cs:intext triggered by grouped sorts.
+
 ========================
 Changes in version 1.2.3
 ========================

diff --git a/citeproc.js b/citeproc.js
@@ -11340,16 +11340,10 @@ CSL.Node.intext = {
             this.execs.push(func);
         }
         if (this.tokentype === CSL.END) {
-            state.opt.grouped_sort = state.opt.xclass === "in-text" 
-                && (state.citation.opt.collapse 
-                    && state.citation.opt.collapse.length)
-                || (state.citation.opt.cite_group_delimiter
-                    && state.citation.opt.cite_group_delimiter.length)
-                && state.opt.update_mode !== CSL.POSITION
-                && state.opt.update_mode !== CSL.NUMERIC;
-            if (state.opt.grouped_sort 
-                && state.citation_sort.opt.sort_directions.length) {
-                state.intext_sort.opt.sort_directions = state.citation_sort.opt.sort_directions;
+            state.intext_sort = {
+                opt: {
+                    sort_directions: state.citation_sort.opt.sort_directions
+                }
             }
             state.intext.srt = state.citation.srt;
         }

diff --git a/citeproc_commonjs.js b/citeproc_commonjs.js
@@ -11340,16 +11340,10 @@ CSL.Node.intext = {
             this.execs.push(func);
         }
         if (this.tokentype === CSL.END) {
-            state.opt.grouped_sort = state.opt.xclass === "in-text" 
-                && (state.citation.opt.collapse 
-                    && state.citation.opt.collapse.length)
-                || (state.citation.opt.cite_group_delimiter
-                    && state.citation.opt.cite_group_delimiter.length)
-                && state.opt.update_mode !== CSL.POSITION
-                && state.opt.update_mode !== CSL.NUMERIC;
-            if (state.opt.grouped_sort 
-                && state.citation_sort.opt.sort_directions.length) {
-                state.intext_sort.opt.sort_directions = state.citation_sort.opt.sort_directions;
+            state.intext_sort = {
+                opt: {
+                    sort_directions: state.citation_sort.opt.sort_directions
+                }
             }
             state.intext.srt = state.citation.srt;
         }

diff --git a/src/load.js b/src/load.js
@@ -35,7 +35,7 @@
 
 var CSL = {
 
-    PROCESSOR_VERSION: "1.2.3",
+    PROCESSOR_VERSION: "1.2.4",
 
     LOCATOR_LABELS_REGEXP: new RegExp("^((art|ch|subch|col|fig|l|n|no|op|p|pp|para|subpara|supp|pt|r|sec|subsec|sv|sch|tit|vrs|vol)\\.)\\s+(.*)"),