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

Fix items in collection not appearing immediately after an import with new system

Browse source
This commit is contained in:
Dan Stillman 2009-08-08 18:06:44 +00:00
parent a1a85911d8
commit 2029d2aebd
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -98,6 +98,16 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
// Generate the tree contents in a timer to allow message above to display // Generate the tree contents in a timer to allow message above to display
var paneLoader = function(obj) { var paneLoader = function(obj) {
if (Zotero.locked) {
var msg = "Zotero is locked -- not loading items tree";
Zotero.debug(msg, 2);
if (obj._ownerDocument.defaultView.ZoteroPane) {
obj._ownerDocument.defaultView.ZoteroPane.clearItemsPaneMessage();
}
return;
}
// If a DB transaction is open, display error message and bail // If a DB transaction is open, display error message and bail
if (!Zotero.stateCheck()) { if (!Zotero.stateCheck()) {
if (obj._ownerDocument.defaultView.ZoteroPane) { if (obj._ownerDocument.defaultView.ZoteroPane) {

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

@ -394,10 +394,6 @@ var Zotero = new function(){
* Check if a DB transaction is open and, if so, disable Zotero * Check if a DB transaction is open and, if so, disable Zotero
*/ */
function stateCheck() { function stateCheck() {
if (Zotero.locked) {
return true;
}
if (Zotero.DB.transactionInProgress()) { if (Zotero.DB.transactionInProgress()) {
this.initialized = false; this.initialized = false;
this.skipLoading = true; this.skipLoading = true;