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

Fix setDocPrefs, part 2

Browse Source
This commit is contained in:
Simon Kornblith 2012-01-14 00:34:08 -05:00
parent c77c7ca17d
commit c5b4043155
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -628,7 +628,8 @@ Zotero.Integration.Document.prototype._getSession = function(require, dontRunSet
} catch(e) { } catch(e) {
// make sure style is defined // make sure style is defined
if(e instanceof Zotero.Integration.DisplayException && e.name === "invalidStyle") { if(e instanceof Zotero.Integration.DisplayException && e.name === "invalidStyle") {
this._session.setDocPrefs(this._doc, this._app.primaryFieldType, this._app.secondaryFieldType, function() { this._session.setDocPrefs(this._doc, this._app.primaryFieldType,
this._app.secondaryFieldType, function() {
me._doc.setDocumentData(me._session.data.serializeXML()); me._doc.setDocumentData(me._session.data.serializeXML());
me._session.reload = true; me._session.reload = true;
callback(true); callback(true);
@ -779,7 +780,8 @@ Zotero.Integration.Document.prototype.setDocPrefs = function() {
var me = this; var me = this;
this._getSession(false, true, function(haveSession) { this._getSession(false, true, function(haveSession) {
var setDocPrefs = function() { var setDocPrefs = function() {
me._session.setDocPrefs(me._app.primaryFieldType, me._app.secondaryFieldType, function(oldData) { me._session.setDocPrefs(me._doc, me._app.primaryFieldType, me._app.secondaryFieldType,
function(oldData) {
if(oldData || oldData === null) { if(oldData || oldData === null) {
me._doc.setDocumentData(me._session.data.serializeXML()); me._doc.setDocumentData(me._session.data.serializeXML());
if(oldData === null) return; if(oldData === null) return;
@ -1643,7 +1645,7 @@ Zotero.Integration.Session.prototype.setDocPrefs = function(doc, primaryFieldTyp
} }
var me = this; var me = this;
Zotero.Integration.displayDialog(this._doc, Zotero.Integration.displayDialog(doc,
'chrome://zotero/content/integration/integrationDocPrefs.xul', '', io, function() { 'chrome://zotero/content/integration/integrationDocPrefs.xul', '', io, function() {
if(!io.style) { if(!io.style) {
callback(false); callback(false);