suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure delayed citation styling is removed upon proper update

Browse Source 
Ensure delayed citation styling is removed upon proper update
This commit is contained in:
Adomas Venčkauskas 2017-12-12 14:21:42 +02:00
parent 4b78ebcd72
commit b985ef8a53
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chrome/content/zotero/xpcom/integration.js
View File

@ -52,6 +52,8 @@ const INTEGRATION_TYPE_BIBLIOGRAPHY = 2;
const INTEGRATION_TYPE_TEMP = 3; const INTEGRATION_TYPE_TEMP = 3;
const DELAY_CITATIONS_PROMPT_TIMEOUT = 5/*seconds*/; const DELAY_CITATIONS_PROMPT_TIMEOUT = 5/*seconds*/;
const DELAYED_CITATION_STYLING = "\\uldash";
const DELAYED_CITATION_STYLING_CLEAR = "\\ulclear";
Zotero.Integration = new function() { Zotero.Integration = new function() {
@ -1003,7 +1005,13 @@ Zotero.Integration.Fields.prototype._updateDocument = async function(forceCitati
} }
if(!citation.properties.dontUpdate) { if(!citation.properties.dontUpdate) {
// Word will preserve previous text styling, so we need to force remove it
// for citations that were inserted with delay styling
if (citation.properties.formattedCitation && citation.properties.formattedCitation.includes(DELAYED_CITATION_STYLING)) {
isRich = citationField.setText(`${DELAYED_CITATION_STYLING_CLEAR}{${formattedCitation}}`);
} else {
isRich = citationField.setText(formattedCitation); isRich = citationField.setText(formattedCitation);
}
citation.properties.formattedCitation = formattedCitation; citation.properties.formattedCitation = formattedCitation;
citation.properties.plainCitation = citationField.getText(); citation.properties.plainCitation = citationField.getText();
@ -1590,7 +1598,7 @@ Zotero.Integration.Session.prototype.writeDelayedCitation = Zotero.Promise.corou
} catch(e) { } catch(e) {
throw e; throw e;
} }
text = `\\uldash{${text}}`; text = `${DELAYED_CITATION_STYLING}{${text}}`;
// Make sure we'll prompt for manually edited citations // Make sure we'll prompt for manually edited citations
var isRich = false; var isRich = false;
@ -2223,7 +2231,7 @@ Zotero.Integration.BibliographyField = class extends Zotero.Integration.Field {
} }
} }
resolveCorrupt() { resolveCorrupt(code) {
return Zotero.Promise.coroutine(function* () { return Zotero.Promise.coroutine(function* () {
Zotero.debug(`Integration: handling corrupt bibliography field ${code}`); Zotero.debug(`Integration: handling corrupt bibliography field ${code}`);
var msg = Zotero.getString("integration.corruptBibliography")+'\n\n'+ var msg = Zotero.getString("integration.corruptBibliography")+'\n\n'+