fix deconj display when using alternatives

This commit is contained in:
wareya committed 2017-12-17 22:03:23 -05:00
1 parent e0635bda14
commit 126a4a6732
2 files changed
+9 -6

No files matched your search

+6 -3
View File
@@ -670,11 +670,13 @@ function build_lookup_comb (forms)
if(!looked_up.hasOwnProperty(form.text)) if(!looked_up.hasOwnProperty(form.text))
{ {
let result = search(form.text); let result = search(form.text);
let copied_result = [];
if(result) if(result)
{ {
for(let r = 0; r < result.length; r++) for(let r = 0; r < result.length; r++)
{ {
let entry = result[r]; let entry = {};
Object.assign(entry, result[r]);
entry.deconj = undefined; // clear if something set it before, we need this later entry.deconj = undefined; // clear if something set it before, we need this later
// store all the parts of speech that this dictionary entry can apply to // store all the parts of speech that this dictionary entry can apply to
// normally, they're scattered across its senses // normally, they're scattered across its senses
@@ -686,8 +688,9 @@ function build_lookup_comb (forms)
for(let j = 0; j < sense.pos.length; j++) for(let j = 0; j < sense.pos.length; j++)
entry.allpos.add(sense.pos[j]); entry.allpos.add(sense.pos[j]);
} }
copied_result.push(entry);
} }
looked_up[form.text] = result; looked_up[form.text] = copied_result;
} }
} }
} }
@@ -999,7 +1002,7 @@ function lookup_indirect(text, time, divexisted, alternatives_mode, strict_alter
if(results.length > 0) if(results.length > 0)
first = false; first = false;
} }
console.log(results); //console.log(results);
if(results.length > 0) if(results.length > 0)
return results; return results;
} }
+3 -3
View File
@@ -163,8 +163,8 @@ function clip(str)
function build_div_inner (text, result) function build_div_inner (text, result)
{ {
console.log("building div for " + text); //console.log("building div for " + text);
console.log(result); //console.log(result);
let temp = document.createElement("div"); let temp = document.createElement("div");
if(settings.showoriginal) if(settings.showoriginal)
{ {
@@ -194,7 +194,7 @@ function build_div_inner (text, result)
for(let i = 0; i < result.length; i++) for(let i = 0; i < result.length; i++)
{ {
let term = result[i]; let term = result[i];
if(term.deconj) if(term.deconj && term.deconj.length > 0)
text = term.deconj.values().next().value.text; text = term.deconj.values().next().value.text;
//print_object(term); //print_object(term);
let temptag = document.createElement("span"); let temptag = document.createElement("span");