Skip to content

Commit

Permalink
fixed an issue calling main.js twice
Browse files Browse the repository at this point in the history
  • Loading branch information
Moritz Wicenec authored and Moritz Wicenec committed Mar 1, 2022
1 parent 56bab03 commit c576c76
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion daliuge-translator/dlg/dropmake/web/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
$(document).ready(function () {
// jquery starts here

//hides the dropdown navbar elements when stopping hovering over the element
$(".dropdown-menu").mouseleave(function () {
$(".dropdown-menu").dropdown('hide')
Expand All @@ -9,6 +8,7 @@ $(document).ready(function () {
//handles switching of the dynamic deploy split button
$("#deployDropdowns .dropdown-menu .dropdown-item").click(function(){
//take note of previous main button and the one that was just pressed

var oldActive = $("#deployDropdowns").children()[0];
var oldActiveId = $(oldActive).attr("id")
var newActive = event.target
Expand All @@ -31,6 +31,7 @@ $(document).ready(function () {
})

//get saved settings from local storage or set a default value
fillOutSettings()

$('#settingsModal').on('hidden.bs.modal', function () {
fillOutSettings()
Expand Down
1 change: 0 additions & 1 deletion daliuge-translator/dlg/dropmake/web/pg_viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<script src="/static/src/echarts-dagre.min.js"></script>
<script src="/static/src/lib/fflate/index.js"></script>
<script src="/static/src/require.js"></script>
<script src="/static/main.js"></script>

<!-- CSS -->
<link rel="stylesheet" href="/static/src/bootstrap/css/bootstrap.min.css">
Expand Down

0 comments on commit c576c76

Please sign in to comment.