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

Fix various connector-mode issues for 5.0

Browse source 
Still more to fix
This commit is contained in:
Dan Stillman 2016-04-04 06:33:15 -04:00
parent cdedbaccac
commit 0f7d1c7061
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/browser.js
View file

@ -294,7 +294,7 @@ var Zotero_Browser = new function() {
* object, and updates the status of the capture icon
*/
var contentLoad = Zotero.Promise.coroutine(function* (event) {
if (Zotero.Schema.schemaUpdatePromise.isPending()) {
if (Zotero.Schema && Zotero.Schema.schemaUpdatePromise.isPending()) {
yield Zotero.Schema.schemaUpdatePromise;
}
@ -448,7 +448,7 @@ var Zotero_Browser = new function() {
* thereof of the current page
*/
this.updateStatus = Zotero.Promise.coroutine(function* () {
if (Zotero.Schema.schemaUpdatePromise.isPending()) {
if (Zotero.Schema && Zotero.Schema.schemaUpdatePromise.isPending()) {
yield Zotero.Schema.schemaUpdatePromise;
}

4
chrome/content/zotero/xpcom/zotero.js
View file

@ -789,7 +789,9 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
Zotero.getString('startupError.checkPermissions')
]);
Zotero.startupError = msg;
} else if(e.name == "NS_ERROR_STORAGE_BUSY" || e.result == 2153971713) {
}
// Storage busy
else if (e.message.endsWith('2153971713')) {
if(Zotero.isStandalone) {
// Standalone should force Fx to release lock
if(!haveReleasedLock && Zotero.IPC.broadcast("releaseLock")) {

8
chrome/content/zotero/zoteroPane.js
View file

@ -372,7 +372,7 @@ var ZoteroPane = new function()
}
_madeVisible = true;
yield this.unserializePersist();
this.unserializePersist();
this.updateToolbarPosition();
this.updateTagSelectorSize();
@ -4508,7 +4508,7 @@ var ZoteroPane = new function()
/**
* Unserializes zotero-persist elements from preferences
*/
this.unserializePersist = Zotero.Promise.coroutine(function* () {
this.unserializePersist = function () {
_unserialized = true;
var serializedValues = Zotero.Prefs.get("pane.persist");
if(!serializedValues) return;
@ -4533,10 +4533,10 @@ var ZoteroPane = new function()
if(this.itemsView) {
// may not yet be initialized
try {
yield this.itemsView.sort();
this.itemsView.sort();
} catch(e) {};
}
});
};
/**
* Serializes zotero-persist elements to preferences

2
components/zotero-service.js
View file

@ -286,6 +286,8 @@ function makeZoteroContext(isConnector) {
subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/" + xpcomFile + ".js", zContext);
}
catch (e) {
dump("Error loading " + xpcomFile + ".js\n\n");
dump(e + "\n\n");
Components.utils.reportError("Error loading " + xpcomFile + ".js", zContext);
throw (e);
}