diff --git a/index.html b/index.html index 4ad53d74..1c0b1867 100644 --- a/index.html +++ b/index.html @@ -312,6 +312,7 @@ + @@ -500,103 +501,101 @@ + + + + + + + + Hi-C Map + + + Live Map + + + - - - - - - - Juicebox File - - - - - - Load Live Contact Frequency Map ... - - - - - - - Load Juicebox Archive Maps ... - - - - - - - Load ENCODE Maps ... - - - - - - - - - Load Local Map File ... - - - - + + + + + Load Hi-C Map + + + + + + + Load Juicebox Archive Maps ... + + + + + + + Load ENCODE Maps ... + + + + + + + + + Load Local Map File ... - - - - - - - - Load Dropbox Map File ... - - - + + - - - - - - - Load Google Drive Map File ... - + + + + + + + + Load Dropbox Map File ... + + - - - - - - Load Map URL ... - - - - - + + + + + + + + Load Google Drive Map File ... + + + + + + + + + Load Map URL ... + + + - - - Hi-C Map - - - Live Map - - - - - - Threshold - - Enter + + + Threshold + + Enter + + Calculate Live Map + diff --git a/js/juicebox/juiceboxPanel.js b/js/juicebox/juiceboxPanel.js index 0e5ec0be..939b108b 100644 --- a/js/juicebox/juiceboxPanel.js +++ b/js/juicebox/juiceboxPanel.js @@ -135,6 +135,9 @@ class JuiceboxPanel extends Panel { this.browser.contactMatrixView.assessPanelTabSelection(false) + document.getElementById('hic-live-contact-frequency-map-threshold-widget').style.display = 'none' + document.getElementById('hic-file-chooser-dropdown').style.display = 'block' + const hicMapTab = document.getElementById('spacewalk-juicebox-panel-hic-map-tab'); const liveMapTab = document.getElementById('spacewalk-juicebox-panel-live-map-tab'); @@ -147,8 +150,12 @@ class JuiceboxPanel extends Panel { for (const tab of tabs) { tab.addEventListener('show.bs.tab', event => { if (hicMapTab.id === event.target.id) { + document.getElementById('hic-live-contact-frequency-map-threshold-widget').style.display = 'none' + document.getElementById('hic-file-chooser-dropdown').style.display = 'block' this.browser.contactMatrixView.assessPanelTabSelection(false) } else if (liveMapTab.id === event.target.id) { + document.getElementById('hic-live-contact-frequency-map-threshold-widget').style.display = 'block' + document.getElementById('hic-file-chooser-dropdown').style.display = 'none' this.browser.contactMatrixView.assessPanelTabSelection(true) } console.log(`Juicebox panel: ${ event.target.id } tab selection`) diff --git a/js/juicebox/liveContactMapService.js b/js/juicebox/liveContactMapService.js index 486cfe48..fdc0943c 100644 --- a/js/juicebox/liveContactMapService.js +++ b/js/juicebox/liveContactMapService.js @@ -23,7 +23,7 @@ class LiveContactMapService { this.input = document.querySelector('#spacewalk_contact_frequency_map_adjustment_select_input') this.input.value = distanceThreshold.toString() - document.querySelector('#spacewalk_contact_frequency_map__button').addEventListener('click', () => { + document.querySelector('#spacewalk_contact_frequency_map_button').addEventListener('click', () => { this.distanceThreshold = clamp(parseInt(this.input.value, 10), 0, maxDistanceThreshold) diff --git a/styles/_juicebox_panel.scss b/styles/_juicebox_panel.scss index 83260f7b..866c72c3 100644 --- a/styles/_juicebox_panel.scss +++ b/styles/_juicebox_panel.scss @@ -9,43 +9,28 @@ .card-header { width: 100%; - .list-group { - width: 100%; - - .spacewalk_card_drag_container { - - i.fa-grip-horizontal { - cursor: unset; - color: transparent; - background-color: transparent; - } + padding-bottom: unset; - a.dropdown-toggle { - color: unset; - } - } - - .list-group-item { - padding: 0; + .spacewalk_card_drag_container { + i.fa-grip-horizontal { + cursor: unset; + color: transparent; + background-color: transparent; } + } - .list-group-item:last-child { - width: 256px; + .list-group { + width: 100%; + #hic-live-contact-frequency-map-threshold-widget.list-group-item { + div.input-group { + width: 200px; + } } - } } .card-body { - - #spacewalk_hic_url_form_group { - width: 95%; - margin-top: 4px; - margin-bottom: 4px; - } - #spacewalk_juicebox_root_container { - .hic-root { margin: 0; border-color: transparent; @@ -53,7 +38,6 @@ border-radius: .25rem; } } - } } diff --git a/styles/app.css b/styles/app.css index 3df54108..b16e47b6 100644 --- a/styles/app.css +++ b/styles/app.css @@ -204,28 +204,18 @@ div.navbar-brand { } #spacewalk_juicebox_panel.card .card-header { width: 100%; + padding-bottom: unset; } -#spacewalk_juicebox_panel.card .card-header .list-group { - width: 100%; -} -#spacewalk_juicebox_panel.card .card-header .list-group .spacewalk_card_drag_container i.fa-grip-horizontal { +#spacewalk_juicebox_panel.card .card-header .spacewalk_card_drag_container i.fa-grip-horizontal { cursor: unset; color: transparent; background-color: transparent; } -#spacewalk_juicebox_panel.card .card-header .list-group .spacewalk_card_drag_container a.dropdown-toggle { - color: unset; -} -#spacewalk_juicebox_panel.card .card-header .list-group .list-group-item { - padding: 0; -} -#spacewalk_juicebox_panel.card .card-header .list-group .list-group-item:last-child { - width: 256px; +#spacewalk_juicebox_panel.card .card-header .list-group { + width: 100%; } -#spacewalk_juicebox_panel.card .card-body #spacewalk_hic_url_form_group { - width: 95%; - margin-top: 4px; - margin-bottom: 4px; +#spacewalk_juicebox_panel.card .card-header .list-group #hic-live-contact-frequency-map-threshold-widget.list-group-item div.input-group { + width: 200px; } #spacewalk_juicebox_panel.card .card-body #spacewalk_juicebox_root_container .hic-root { margin: 0; diff --git a/styles/app.css.map b/styles/app.css.map index e3a14364..abca017b 100644 --- a/styles/app.css.map +++ b/styles/app.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["_navbar.scss","app.scss","_color.scss","_checkbox-menu.scss","_panel.scss","_data_file_load_modal.scss","_distance_map_panel.scss","_juicebox_panel.scss","_igv_panel.scss","_ui_manager.scss","_info_panel.scss"],"names":[],"mappings":"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;EACA,kBC3CiB;;;AD8CnB;EAEE;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,QA9DwC;EAgExC;EAEA;;AAEA;EACE,OChFc;EDiFd;;;AAKJ;EAEE;EAEA,OAjFkD;EAkFlD,QAnFmD;EAqFnD;EACA;EACA;EAEA;EACA;EACA;EAEA;EACA;EACA;EAEA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA,eAzHsC;EA0HtC;EACA;EACA;;AAIJ;EAEE;EACA;EAEA,OAzI8B;EA0I9B;EAEA;EAEA;EACA;EACA;;AAEA;EACE;EACA,QAnJmC;EAqJnC;EACA,aAtJmC;EAuJnC;EACA;EACA;;AAGF;EACE;EACA;EAEA,OA/JmC;EAgKnC;;AAIA;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAKJ;EACE;EACA,QA5LmC;EA8LnC;EACA,aA/LmC;EAgMnC;EACA;EAEA;;;AAOJ;EACE;EACA;EACA;;AAMA;EACE;;;AAON;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EAEE;EAEA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;;;AAIF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA","file":"app.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["_navbar.scss","app.scss","_color.scss","_checkbox-menu.scss","_panel.scss","_data_file_load_modal.scss","_distance_map_panel.scss","_juicebox_panel.scss","_igv_panel.scss","_ui_manager.scss","_info_panel.scss"],"names":[],"mappings":"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EAEA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EAEA;EACA,QA9DwC;EAgExC;EAEA;;AAEA;EACE,OChFc;EDiFd;;;AAKJ;EAEE;EAEA,OAjFkD;EAkFlD,QAnFmD;EAqFnD;EACA;EACA;EAEA;EACA;EACA;EAEA;EACA;EACA;EAEA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA,eAzHsC;EA0HtC;EACA;EACA;;AAIJ;EAEE;EACA;EAEA,OAzI8B;EA0I9B;EAEA;EAEA;EACA;EACA;;AAEA;EACE;EACA,QAnJmC;EAqJnC;EACA,aAtJmC;EAuJnC;EACA;EACA;;AAGF;EACE;EACA;EAEA,OA/JmC;EAgKnC;;AAIA;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAKJ;EACE;EACA,QA5LmC;EA8LnC;EACA,aA/LmC;EAgMnC;EACA;EAEA;;;AAOJ;EACE;EACA;EACA;;AAMA;EACE;;;AAON;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EAEE;EAEA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;;;AAIF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA","file":"app.css"} \ No newline at end of file