From 0b99119fe5082d7b162bb893ce053846241c24d7 Mon Sep 17 00:00:00 2001 From: zsloan Date: Mon, 24 Jun 2019 13:48:36 -0500 Subject: Fixed issue that caused search result pages to not work in IE --- wqflask/wqflask/marker_regression/display_mapping_results.py | 4 ++-- wqflask/wqflask/templates/gsearch_gene.html | 2 +- wqflask/wqflask/templates/gsearch_pheno.html | 2 +- wqflask/wqflask/templates/search_result_page.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wqflask/wqflask/marker_regression/display_mapping_results.py b/wqflask/wqflask/marker_regression/display_mapping_results.py index 41cdf819..91fdae8f 100644 --- a/wqflask/wqflask/marker_regression/display_mapping_results.py +++ b/wqflask/wqflask/marker_regression/display_mapping_results.py @@ -753,7 +753,7 @@ class DisplayMappingResults(object): locPixel += (Mb*(_chr[-1].cM-_chr[0].cM)/self.ChrLengthCMList[i])*plotXScale break if locPixel >= 0 and self.plotScale == 'physic': - traitPixel = ((locPixel, yZero), (locPixel-6, yZero+12), (locPixel+6, yZero+12)) + traitPixel = ((locPixel, yZero), (locPixel-7, yZero+14), (locPixel+7, yZero+14)) canvas.drawPolygon(traitPixel, edgeColor=pid.black, fillColor=self.TRANSCRIPT_LOCATION_COLOR, closed=1) if self.legendChecked: @@ -764,7 +764,7 @@ class DisplayMappingResults(object): leftOffset = xLeftOffset else: leftOffset = xLeftOffset+(nCol-1)*200*fontZoom - canvas.drawPolygon(((leftOffset+6, startPosY-6), (leftOffset, startPosY+6), (leftOffset+12, startPosY+6)), edgeColor=pid.black, fillColor=self.TRANSCRIPT_LOCATION_COLOR, closed=1) + canvas.drawPolygon(((leftOffset+7, startPosY-7), (leftOffset, startPosY+7), (leftOffset+14, startPosY+7)), edgeColor=pid.black, fillColor=self.TRANSCRIPT_LOCATION_COLOR, closed=1) canvas.drawString("Sequence Site", (leftOffset+15), (startPosY+5), smallLabelFont, self.TOP_RIGHT_INFO_COLOR) def drawSNPTrackNew(self, canvas, offset= (40, 120, 80, 10), zoom = 1, startMb = None, endMb = None): diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html index 62a2944c..70390830 100644 --- a/wqflask/wqflask/templates/gsearch_gene.html +++ b/wqflask/wqflask/templates/gsearch_gene.html @@ -161,7 +161,7 @@ 'render': function(data, type, row, meta) { try { return decodeURIComponent(escape(data.description)) - } catch { + } catch(err) { return escape(data.description) } } diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html index fd06b771..42bf1b64 100644 --- a/wqflask/wqflask/templates/gsearch_pheno.html +++ b/wqflask/wqflask/templates/gsearch_pheno.html @@ -137,7 +137,7 @@ 'render': function(data, type, row, meta) { try { return decodeURIComponent(escape(data.description)) - } catch { + } catch(err) { return data.description } } diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 374347bd..d1bfbd23 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -282,7 +282,7 @@ 'render': function(data, type, row, meta) { try { return decodeURIComponent(escape(data.description)) - } catch { + } catch(err){ return escape(data.description) } } @@ -325,7 +325,7 @@ 'render': function(data, type, row, meta) { try { return decodeURIComponent(escape(data.description)) - } catch { + } catch(err){ return data.description } } -- cgit v1.2.3