www

commit e4f49588c0af7c7e6e281bc69e4b59b9c64f47fb
parent 604082e869b0ebd244cfd42cfd3b0619a5f4b78b
Author: Simon Kornblith <simon@simonster.com>
Date:   Thu, 10 Jul 2008 22:35:50 +0000

fix blank fields when converting between footnotes/endnotes or between field types


Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -510,16 +510,17 @@ Zotero.Integration.Request.prototype.setDocPrefs = function() {
 		.getService(Components.interfaces.nsIWindowWatcher)
 		.openWindow(null, 'chrome://zotero/content/integrationDocPrefs.xul', '',
 		'chrome,modal,centerscreen' + (Zotero.isWin ? ',popup' : ''), io, true);
-	this._session.prefs.useEndnotes = io.useEndnotes;
-	this._session.prefs.fieldType = io.useBookmarks;
-	Zotero.debug("prefs are")
-	Zotero.debug(this._session.prefs);
 	if(!oldStyle || oldStyle != io.style
 			|| io.useEndnotes != this._session.prefs.useEndnotes
 			|| io.useBookmarks != this._session.prefs.fieldType) {
 		this._session.regenerateAll = this._session.bibliographyHasChanged = true;
-		this._session.setStyle(io.style, this._session.prefs);
+		
+		if(oldStyle != io.style) {
+			this._session.setStyle(io.style, this._session.prefs);
+		}
 	}
+	this._session.prefs.useEndnotes = io.useEndnotes;
+	this._session.prefs.fieldType = io.useBookmarks;
 	
 	this.responseHeader.appendChild(<style
 		id={io.style} class={this._session.style.class}