Merge pull request #124 from parthopdas/issue-77

Fixes #77 regression
digitalpalireader · Feb 26, 2020 · 6143c68 · 6143c68
2 parents 35557cc + 0fd122f
commit 6143c68
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/digitalpalireader/content/js/dict.js b/digitalpalireader/content/js/dict.js
@@ -85,7 +85,7 @@ function startDictLookup(dictType,dictQuery,dictOpts,dictEntry) {
 	var tabT = "Dict: '" + (G_dictQuery != ''?G_dictQuery:toUni(G_dictEntry.split(',')[1])) + '\' in ' + st[G_dictType];
 
 	document.getElementsByTagName('title')[0].innerHTML = tabT;
-	$('#difb').html('');
+	$(`#${DPR_PAL.getDifId()}`).html('');
 	$('#dicthead').html('<span style="float:left" title="Click to copy permalink to clipboard" onclick="permalinkClick(\''+'dpr:dict?type='+G_dictType+(G_dictQuery?'&query=' + toUni(G_dictQuery.replace(/ /g,'_')):'') + '&opts=' + G_dictOpts.join(',') + (G_dictEntry?'&entry=' + toUni(G_dictEntry.replace(/ /g,'_')):'')+'\',1);" class="pointer hoverShow">♦&nbsp;</span>');
 
 	G_dictQuery = G_dictQuery.toLowerCase();

diff --git a/digitalpalireader/content/js/dict_xml.js b/digitalpalireader/content/js/dict_xml.js
@@ -6,7 +6,7 @@ var G_phmark = 0;
 
 var pedfileget = '';
 
-const makeUniqueStringForCaseInsensitiveFS = s => {
+function makeUniqueStringForCaseInsensitiveFS(s) {
   const charToHexStr = c => Number(c.charCodeAt(0)).toString(16).padStart(2, '0').toUpperCase();
 
   const uniqueStr =

diff --git a/digitalpalireader/content/js/dpr_pal.js b/digitalpalireader/content/js/dpr_pal.js
@@ -172,7 +172,7 @@ console.log('Loading DPR_PAL...');
       });
   }
 
-  DPR_PAL.getDifId = () => /frombox=[^&]/.test(window.location.href) ? 'difb-bottom' : 'difb';
+  DPR_PAL.getDifId = () => /analysis=[^&]/.test(window.location.href) ? 'difb-bottom' : 'difb';
 
   DPR_PAL.isDictionaryFeature = () => {
     const matcher = DPR_PAL.isWeb ? /feature=dictionary/ : /dict\.htm/;

diff --git a/digitalpalireader/content/js/format.js b/digitalpalireader/content/js/format.js
@@ -538,7 +538,7 @@ function clearDivs(which) { // place divs to be cleared here
 	if (!which || which.indexOf('dict') > -1) { // dictionary search stuff
 		$('#dict').html('');
 		$('#difhist').html('');
-		$('#difb').html('');
+		$(`#${DPR_PAL.getDifId()}`).html('');
 	}
 	if (!which || which.indexOf('anf') > -1) { // analyze frame stuff
 		$('#anfs').html('');