Restore dual require for Citations collection; add dual require for C…

…itation Model Restore dual require for Citations collection; add dual require for Citation Model #2395
NCEAS · May 2, 2024 · e2e9b7c · e2e9b7c
1 parent 28f6859
commit e2e9b7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/js/collections/Citations.js b/src/js/collections/Citations.js
@@ -1,8 +1,8 @@
 /* global define */
 "use strict";
 
-define(['jquery', 'underscore', 'backbone'],
-    function($, _, Backbone) {
+define(['jquery', 'underscore', 'backbone', 'models/CitationModel'],
+    function($, _, Backbone, CitationModel) {
 
     /**
      * @class Citations
@@ -18,7 +18,7 @@ define(['jquery', 'underscore', 'backbone'],
       /** @lends Citations.prototype */{
 
         model: function (attrs, options) {
-            // We use the inline require here to
+            // We use the inline require here in addition to the define above to
             // avoid an issue caused by the circular dependency between
             // CitationModel and Citations
             var CitationModel = require('models/CitationModel');

diff --git a/src/js/models/CitationModel.js b/src/js/models/CitationModel.js
@@ -156,6 +156,11 @@ define(["jquery", "underscore", "backbone", "collections/Citations"], function (
           // Format the citation metadata = DataONE datasets cited by this
           // citation (external document)
           const cm = response.citationMetadata;
+
+          // We use the inline require here in addition to the define above to
+          // avoid an issue caused by the circular dependency between
+          // CitationModel and Citations
+          var Citations = require('collections/Citations');
           if (cm) {
             if (cm && !(cm instanceof Citations)) {
               const citationMetadata = Object.entries(cm).map(([pid, data]) => {