diff --git a/src/init.js b/src/init.js index b98a7db63..e8730f3a5 100644 --- a/src/init.js +++ b/src/init.js @@ -57,8 +57,6 @@ require.config({ sprintf: 'components/sprintf/dist/sprintf.min', superagent: 'browserified/superagent/index', threejs: 'components/threejs/build/three.min', - twig: 'browserified/twig/twig', - twig_extended: 'lib/twigjs/twig', uri: 'components/uri.js/src', 'web-animations': 'components/web-animations-js/web-animations.min', x2js: 'components/x2js/xml2json.min', diff --git a/src/lib/twigjs/twig.js b/src/lib/twigjs/twig.js index f8eeda445..e8443a19d 100644 --- a/src/lib/twigjs/twig.js +++ b/src/lib/twigjs/twig.js @@ -1,7 +1,7 @@ 'use strict'; define([ - 'twig', + 'browserified/twig/twig', 'src/util/typerenderer', 'src/util/util', ], function(Twig, Renderer, Util) { diff --git a/src/modules/types/display/template-twig/view.js b/src/modules/types/display/template-twig/view.js index efcc5769f..9e9f6821a 100644 --- a/src/modules/types/display/template-twig/view.js +++ b/src/modules/types/display/template-twig/view.js @@ -3,7 +3,7 @@ define([ 'jquery', 'modules/default/defaultview', - 'twig_extended', + 'lib/twigjs/twig', 'src/util/debug', 'src/util/api', 'lodash', diff --git a/src/modules/types/science/chemistry/periodic_table/view.js b/src/modules/types/science/chemistry/periodic_table/view.js index f03c678ba..58efa145e 100644 --- a/src/modules/types/science/chemistry/periodic_table/view.js +++ b/src/modules/types/science/chemistry/periodic_table/view.js @@ -2,7 +2,7 @@ define([ 'modules/default/defaultview', - 'twig_extended', + 'lib/twigjs/twig', 'src/util/debug', 'src/util/colorbar', 'src/util/color', diff --git a/src/src/util/twig.js b/src/src/util/twig.js index 4d62708b4..34fa39920 100644 --- a/src/src/util/twig.js +++ b/src/src/util/twig.js @@ -1,6 +1,6 @@ 'use strict'; -define(['twig_extended', 'src/util/ui', 'src/util/Form'], function ( +define(['lib/twigjs/twig', 'src/util/ui', 'src/util/Form'], function ( Twig, UI, Form, diff --git a/src/src/util/typerenderer.js b/src/src/util/typerenderer.js index bc353cab6..d3c3039b6 100644 --- a/src/src/util/typerenderer.js +++ b/src/src/util/typerenderer.js @@ -443,7 +443,7 @@ define([ functions.object = {}; functions.object.init = async function () { - functions.object.twig = await asyncRequire('twig_extended'); + functions.object.twig = await asyncRequire('lib/twigjs/twig'); }; functions.object.toscreen = function ($element, value, root, options = {}) { const { twig, twigVariableName, toJSON } = options;