mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove field codes for empty bibliographies when refreshing

Browse source 
This happens when a user inserts a bibliography in the middle of a
paragraph and doesn't fully delete it.

Also remove unused code for deleting citations from the document.
This commit is contained in:
Simon Kornblith 2013-06-19 13:37:50 -04:00
parent 44bb1ad976
commit 85682dbb19
1 changed files with 11 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

43
chrome/content/zotero/xpcom/integration.js
View file

@ -1235,6 +1235,7 @@ Zotero.Integration.Document.prototype.setDocPrefs = function() {
// Refresh contents // Refresh contents
fieldGetter = new Zotero.Integration.Fields(me._session, me._doc); fieldGetter = new Zotero.Integration.Fields(me._session, me._doc);
fieldGetter.ignoreEmptyBibliography = false;
return fieldGetter.updateSession().fail(Zotero.Integration.onFieldError) return fieldGetter.updateSession().fail(Zotero.Integration.onFieldError)
.then(fieldGetter.updateDocument.bind( .then(fieldGetter.updateDocument.bind(
fieldGetter, FORCE_CITATIONS_RESET_TEXT, true, true)); fieldGetter, FORCE_CITATIONS_RESET_TEXT, true, true));
@ -1261,6 +1262,7 @@ Zotero.Integration.Document.JSEnumerator.prototype.getNext = function() {
Zotero.Integration.Fields = function(session, doc) { Zotero.Integration.Fields = function(session, doc) {
this._session = session; this._session = session;
this._doc = doc; this._doc = doc;
this.ignoreEmptyBibliography = true;
} }
/** /**
@ -1490,10 +1492,14 @@ Zotero.Integration.Fields.prototype._processFields = function(i) {
throw e; throw e;
} }
} }
} else if(type === INTEGRATION_TYPE_BIBLIOGRAPHY && field.getText().trim() !== "") { } else if(type === INTEGRATION_TYPE_BIBLIOGRAPHY) {
this._bibliographyFields.push(field); if(this.ignoreEmptyBibliography && field.getText().trim() === "") {
if(!this._session.bibliographyData && !this._bibliographyData) { this._removeCodeFields[i] = true;
this._bibliographyData = content; } else {
this._bibliographyFields.push(field);
if(!this._session.bibliographyData && !this._bibliographyData) {
this._bibliographyData = content;
}
} }
} }
} }
@ -2490,33 +2496,6 @@ Zotero.Integration.Session.prototype.unserializeCitation = function(arg, index)
return citation; return citation;
} }
/**
* Marks a citation for removal
*/
Zotero.Integration.Session.prototype.deleteCitation = function(index) {
var oldCitation = (this.citationsByIndex[index] ? this.citationsByIndex[index] : false);
this.citationsByIndex[index] = {properties:{"delete":true}};
if(oldCitation && oldCitation.citationItems & oldCitation.properties.added) {
// clear out old citations if necessary
for each(var citationItem in oldCitation.citationItems) {
if(this.citationsByItemID[citationItem.id]) {
var indexInItemID = this.citationsByItemID[citationItem.id].indexOf(oldCitation);
if(indexInItemID !== -1) {
this.citationsByItemID[citationItem.id] = this.citationsByItemID[citationItem.id].splice(indexInItemID, 1);
if(this.citationsByItemID[citationItem.id].length == 0) {
delete this.citationsByItemID[citationItem.id];
}
}
}
}
}
Zotero.debug("Integration: Deleting old citationID "+oldCitation.citationID);
if(oldCitation.citationID) delete this.citeprocCitationIDs[oldCitation.citationID];
this.updateIndices[index] = true;
}
/** /**
* Gets integration bibliography * Gets integration bibliography
*/ */
@ -2657,7 +2636,7 @@ Zotero.Integration.Session.prototype._updateCitations = function() {
index = parseInt(index); index = parseInt(index);
var citation = this.citationsByIndex[index]; var citation = this.citationsByIndex[index];
if(!citation) continue; if(!citation || citation.properties.delete) continue;
if(this.formatCitation(index, citation)) { if(this.formatCitation(index, citation)) {
this.bibliographyHasChanged = true; this.bibliographyHasChanged = true;
} }