Skip to content

Commit

Permalink
refactored other modules to remove require.js
Browse files Browse the repository at this point in the history
  • Loading branch information
fabian-beck committed Jul 27, 2020
1 parent 9d37b51 commit 098d6ae
Show file tree
Hide file tree
Showing 14 changed files with 1,182 additions and 1,184 deletions.
18 changes: 14 additions & 4 deletions electron/index-electron.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<!-- Rename required to not conflict with JQuery and RequireJS: https://electronjs.org/docs/faq#i-can-not-use-jqueryrequirejsmeteorangularjs-in-electron -->
<!-- Rename required to not conflict with JQuery and RequireJS: https://electronjs.org/docs/faq#i-can-not-use-jqueryrequirejsmeteorangularjs-in-electron -->
<script>
window.nodeRequire = require;
delete window.require;
Expand All @@ -14,7 +14,10 @@
<script type="text/javascript" src="../src/js/lib/codemirror.js"></script>
<script type="text/javascript" src="../src/js/lib/jquery-1.11.3.min.js"></script>
<script type="text/javascript" src="../src/js/lib/jquery.tooltipster.js"></script>

<script type="text/javascript" src="../src/js/lib/jquery_layout.js"></script>
<script type="text/javascript" src="../src/js/lib/figue.js"></script>
<script type="text/javascript" src="../src/js/lib/d3.v3.min.js"></script>

<script type="text/javascript" src="../src/data/search_stopwords.js"></script>
<script type="text/javascript" src="../src/data/tag_categories.js"></script>
<script type="text/javascript" src="../src/data/authorized_tags.js"></script>
Expand All @@ -24,9 +27,16 @@
<script type="text/javascript" src="../src/js/util.js"></script>
<script type="text/javascript" src="../src/js/bib.js"></script>
<script type="text/javascript" src="../src/js/selectors.js"></script>

<script data-main="../src/js/app.js" src="../src/js/require.js"></script>
<script type="text/javascript" src="../src/js/references.js"></script>
<script type="text/javascript" src="../src/js/clustering.js"></script>
<script type="text/javascript" src="../src/js/stats.js"></script>
<script type="text/javascript" src="../src/js/tags.js"></script>
<script type="text/javascript" src="../src/js/page.js"></script>
<script type="text/javascript" src="../src/js/entry_layout.js"></script>
<script type="text/javascript" src="../src/js/timeline.js"></script>

<script data-main="../src/js/app.js" src="../src/js/require.js"></script>

<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
</head>

Expand Down
14 changes: 12 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
<script type="text/javascript" src="js/lib/codemirror.js"></script>
<script type="text/javascript" src="js/lib/jquery-1.11.3.min.js"></script>
<script type="text/javascript" src="js/lib/jquery.tooltipster.js"></script>

<script type="text/javascript" src="js/lib/jquery_layout.js"></script>
<script type="text/javascript" src="js/lib/figue.js"></script>
<script type="text/javascript" src="js/lib/d3.v3.min.js"></script>

<script type="text/javascript" src="data/generated/bib.js"></script>
<script type="text/javascript" src="data/generated/available_pdf.js"></script>
<script type="text/javascript" src="data/generated/available_img.js"></script>
Expand All @@ -20,7 +23,14 @@
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/bib.js"></script>
<script type="text/javascript" src="js/selectors.js"></script>

<script type="text/javascript" src="js/references.js"></script>
<script type="text/javascript" src="js/clustering.js"></script>
<script type="text/javascript" src="js/stats.js"></script>
<script type="text/javascript" src="js/tags.js"></script>
<script type="text/javascript" src="js/page.js"></script>
<script type="text/javascript" src="js/entry_layout.js"></script>
<script type="text/javascript" src="js/timeline.js"></script>

<script data-main="js/app.js" src="js/require.js"></script>
</head>
<body>
Expand Down
Loading

0 comments on commit 098d6ae

Please sign in to comment.