From b016b0e383340850553dbd161905281855834ccc Mon Sep 17 00:00:00 2001 From: turner Date: Thu, 16 Jan 2025 09:58:16 -0500 Subject: [PATCH] clean up --- js/bam/alignmentTrack.js | 2 -- js/cnvpytor/cnvpytorTrack.js | 12 ++++++------ js/feature/featureTrack.js | 8 ++------ js/feature/segTrack.js | 4 ++-- js/feature/wigTrack.js | 6 ++---- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/js/bam/alignmentTrack.js b/js/bam/alignmentTrack.js index e6055bef9..33eb7f8e3 100644 --- a/js/bam/alignmentTrack.js +++ b/js/bam/alignmentTrack.js @@ -889,7 +889,6 @@ class AlignmentTrack extends TrackBase { * * @param menuItem * @param showCheck - * @returns {{init: undefined, name: undefined, click: clickHandler, element: (jQuery|HTMLElement|jQuery.fn.init)}} */ colorByCB(menuItem, showCheck) { @@ -953,7 +952,6 @@ class AlignmentTrack extends TrackBase { * * @param menuItem * @param showCheck - * @returns {{init: undefined, name: undefined, click: clickHandler, element: (jQuery|HTMLElement|jQuery.fn.init)}} */ groupByCB(menuItem, showCheck) { diff --git a/js/cnvpytor/cnvpytorTrack.js b/js/cnvpytor/cnvpytorTrack.js index 078b96e68..e07496e00 100644 --- a/js/cnvpytor/cnvpytorTrack.js +++ b/js/cnvpytor/cnvpytorTrack.js @@ -237,9 +237,9 @@ class CNVPytorTrack extends TrackBase { items.push('
') items.push("Bin Sizes") for (let rd_bin of this.available_bins) { - const checkBox = createCheckbox(rd_bin, rd_bin === this.bin_size) + items.push({ - element: checkBox, + element: createCheckbox(rd_bin, rd_bin === this.bin_size), click: async function binSizesHandler() { this.bin_size = rd_bin // data loader image @@ -257,9 +257,9 @@ class CNVPytorTrack extends TrackBase { let signal_dct = {"rd_snp": "RD and BAF Likelihood", "rd": "RD Signal", "snp": "BAF Likelihood"} for (let signal_name in signal_dct) { - const checkBox = createCheckbox(signal_dct[signal_name], signal_name === this.signal_name) + items.push({ - element: checkBox, + element: createCheckbox(signal_dct[signal_name], signal_name === this.signal_name), click: async function signalTypeHandler() { this.signal_name = signal_name await this.recreate_tracks(this.bin_size) @@ -275,9 +275,9 @@ class CNVPytorTrack extends TrackBase { items.push('
') items.push("CNV caller") for (let cnv_caller of this.available_callers) { - const checkBox = createCheckbox(cnv_caller, cnv_caller === this.cnv_caller) + items.push({ - element: checkBox, + element: createCheckbox(cnv_caller, cnv_caller === this.cnv_caller), click: async function cnvCallerHandler() { this.cnv_caller = cnv_caller // data loader image diff --git a/js/feature/featureTrack.js b/js/feature/featureTrack.js index 8dd497886..dca3f4634 100755 --- a/js/feature/featureTrack.js +++ b/js/feature/featureTrack.js @@ -362,14 +362,12 @@ class FeatureTrack extends TrackBase { for (const colorScheme of ["function", "class"]) { - const element = createCheckbox(`Color by ${colorScheme}`, colorScheme === this.colorBy) - function colorSchemeHandler() { this.colorBy = colorScheme this.trackView.repaintViews() } - menuItems.push({element, click: colorSchemeHandler}) + menuItems.push({element:createCheckbox(`Color by ${colorScheme}`, colorScheme === this.colorBy), click: colorSchemeHandler}) } } @@ -384,8 +382,6 @@ class FeatureTrack extends TrackBase { for (const displayMode of ["COLLAPSED", "SQUISHED", "EXPANDED"]) { - const element = createCheckbox(lut[displayMode], displayMode === this.displayMode) - function displayModeHandler() { this.displayMode = displayMode this.config.displayMode = displayMode @@ -393,7 +389,7 @@ class FeatureTrack extends TrackBase { this.trackView.repaintViews() } - menuItems.push({element, click: displayModeHandler}) + menuItems.push({element:createCheckbox(lut[displayMode], displayMode === this.displayMode), click: displayModeHandler}) } return menuItems diff --git a/js/feature/segTrack.js b/js/feature/segTrack.js index 1689fe132..874b0d815 100755 --- a/js/feature/segTrack.js +++ b/js/feature/segTrack.js @@ -166,10 +166,10 @@ class SegTrack extends TrackBase { menuItems.push("DisplayMode:") const displayOptions = this.type === 'seg' || this.type === 'shoebox' ? ["SQUISHED", "EXPANDED", "FILL"] : ["SQUISHED", "EXPANDED"] for (let displayMode of displayOptions) { - const checkBox = createCheckbox(lut[displayMode], displayMode === this.displayMode) + menuItems.push( { - element: checkBox, + element: createCheckbox(lut[displayMode], displayMode === this.displayMode), click: function displayModeHandler() { this.displayMode = displayMode this.config.displayMode = displayMode diff --git a/js/feature/wigTrack.js b/js/feature/wigTrack.js index f4fe19ed8..de29a5a9f 100755 --- a/js/feature/wigTrack.js +++ b/js/feature/wigTrack.js @@ -173,14 +173,13 @@ class WigTrack extends TrackBase { menuItems.push('
') menuItems.push("
Windowing function
") for (const wf of windowFunctions) { - const element = createCheckbox(wf, this.windowFunction === wf) function clickHandler() { this.windowFunction = wf this.trackView.updateViews() } - menuItems.push({element, click: clickHandler}) + menuItems.push({element:createCheckbox(wf, this.windowFunction === wf), click: clickHandler}) } return menuItems @@ -195,14 +194,13 @@ class WigTrack extends TrackBase { menuItems.push("
Graph type
") for (const gt of graphType) { - const element = createCheckbox(gt, this.graphType === gt) function clickHandler() { this.graphType = gt this.trackView.repaintViews() } - menuItems.push({element, click: clickHandler}) + menuItems.push({element:createCheckbox(gt, this.graphType === gt), click: clickHandler}) } return menuItems