From b1eecdbc3a4314058ddee1b46d4ffab5940e580f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 19 Mar 2018 18:59:39 -0400 Subject: clean up dependency acquisition --- public-src/3rd-party/.gitignore | 1 + public-src/require.config.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'public-src') diff --git a/public-src/3rd-party/.gitignore b/public-src/3rd-party/.gitignore index 4574e17..648c720 100644 --- a/public-src/3rd-party/.gitignore +++ b/public-src/3rd-party/.gitignore @@ -1,3 +1,4 @@ /yarn/ /yarn.LICENSES.txt *.log +/jquery-* diff --git a/public-src/require.config.js b/public-src/require.config.js index 5094bf1..e824aaa 100644 --- a/public-src/require.config.js +++ b/public-src/require.config.js @@ -28,13 +28,13 @@ var require = { }, paths: { "flot" : "/3rd-party/yarn/flot", - //"jquery" : "/3rd-party/yarn/jquery/dist/jquery", - "requirejs" : "/3rd-party/yarn/requirejs/require", + "jarmon" : "/3rd-party/yarn/jarmon/jarmon/jarmon", "javascriptrrd" : "/3rd-party/yarn/javascriptrrd/src/lib", "jquerytools" : "/3rd-party/yarn/jquerytools/src", - "jarmon" : "/3rd-party/yarn/jarmon/jarmon/jarmon", + "requirejs" : "/3rd-party/yarn/requirejs/require", + + "jquery" : "/3rd-party/jquery-1.6.3", "cfg" : "/cfg", - "jquery" : "/jarmon-dependencies/jquery-1.6.3", }, }; -- cgit v1.2.3