Merge pull request #1321 from carlfeberhard/fix.citations

UI, Citations: fix citation-model's import of bibtex to use *either* …
galaxyproject · Dec 15, 2015 · 4c3dfc7 · 4c3dfc7
2 parents 5bf926b + 2acdbe5
commit 4c3dfc7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/client/galaxy/scripts/mvc/citation/citation-model.js b/client/galaxy/scripts/mvc/citation/citation-model.js
@@ -2,8 +2,11 @@ define([
     "libs/bibtex",
     "mvc/base-mvc",
     "utils/localization"
-], function( BibtexParser, baseMVC, _l ){
+], function( parseBibtex, baseMVC, _l ){
 /* global Backbone */
+// we use amd here to require, but bibtex uses a global or commonjs pattern.
+// webpack will load via commonjs and plain requirejs will load as global. Check both
+parseBibtex = parseBibtex || window.BibtexParser;
 
 var logNamespace = 'citation';
 //==============================================================================
@@ -16,7 +19,7 @@ var Citation = Backbone.Model.extend( baseMVC.LoggableMixin ).extend( {
 
     initialize: function() {
         var bibtex = this.get( 'content' );
-        var entry = BibtexParser(bibtex).entries[0];
+        var entry = parseBibtex(bibtex).entries[0];
         this.entry = entry;
         this._fields = {};
         var rawFields = entry.Fields;

diff --git a/static/maps/mvc/citation/citation-model.js.map b/static/maps/mvc/citation/citation-model.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/citation/citation-model.js b/static/scripts/mvc/citation/citation-model.js
diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako
@@ -22,6 +22,7 @@
 
     <script type='text/javascript'>
         workflow_view = null;
+        console.debug( 'bibtex?', window.BibtexParser );
 
         // URLs used by galaxy.workflows.js
         var config = {