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

Restore Notifier enable()/disable() for use by Attachment.importFromURL() and importFromDocument(), which do two-part saves and need to not send notifications after the first part

Browse Source
This commit is contained in:
Dan Stillman 2007-02-21 19:46:14 +00:00
parent 937072e875
commit 937ccaa850
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome/content/zotero/xpcom/attachments.js
View File

@ -221,7 +221,12 @@ Zotero.Attachments = new function(){
attachmentItem.setField('title', title); attachmentItem.setField('title', title);
attachmentItem.setField('url', url); attachmentItem.setField('url', url);
attachmentItem.setField('accessDate', "CURRENT_TIMESTAMP"); attachmentItem.setField('accessDate', "CURRENT_TIMESTAMP");
// Don't send a Notifier event on the incomplete item
var disabled = Zotero.Notifier.disable();
attachmentItem.save(); attachmentItem.save();
if (disabled) {
Zotero.Notifier.enable();
}
var itemID = attachmentItem.getID(); var itemID = attachmentItem.getID();
// Add to collections // Add to collections
@ -246,6 +251,8 @@ Zotero.Attachments = new function(){
_addToDB(file, url, title, Zotero.Attachments.LINK_MODE_IMPORTED_URL, _addToDB(file, url, title, Zotero.Attachments.LINK_MODE_IMPORTED_URL,
mimeType, null, sourceItemID, itemID); mimeType, null, sourceItemID, itemID);
Zotero.Notifier.trigger('add', 'item', itemID);
// We don't have any way of knowing that the file // We don't have any way of knowing that the file
// is flushed to disk, so we just wait a second // is flushed to disk, so we just wait a second
// and hope for the best -- we'll index it later // and hope for the best -- we'll index it later
@ -411,7 +418,12 @@ Zotero.Attachments = new function(){
attachmentItem.setField('title', title); attachmentItem.setField('title', title);
attachmentItem.setField('url', url); attachmentItem.setField('url', url);
attachmentItem.setField('accessDate', "CURRENT_TIMESTAMP"); attachmentItem.setField('accessDate', "CURRENT_TIMESTAMP");
// Don't send a Notifier event on the incomplete item
var disabled = Zotero.Notifier.disable();
attachmentItem.save(); attachmentItem.save();
if (disabled) {
Zotero.Notifier.enable();
}
var itemID = attachmentItem.getID(); var itemID = attachmentItem.getID();
// Create a new folder for this item in the storage directory // Create a new folder for this item in the storage directory
@ -432,6 +444,8 @@ Zotero.Attachments = new function(){
_addToDB(file, url, title, Zotero.Attachments.LINK_MODE_IMPORTED_URL, mimeType, _addToDB(file, url, title, Zotero.Attachments.LINK_MODE_IMPORTED_URL, mimeType,
charsetID, sourceItemID, itemID); charsetID, sourceItemID, itemID);
Zotero.Notifier.trigger('add', 'item', itemID);
// Add to collections // Add to collections
if (parentCollectionIDs){ if (parentCollectionIDs){
var ids = Zotero.flattenArguments(parentCollectionIDs); var ids = Zotero.flattenArguments(parentCollectionIDs);

34
chrome/content/zotero/xpcom/notifier.js
View File

@ -38,6 +38,9 @@ Zotero.Notifier = new function(){
this.begin = begin; this.begin = begin;
this.commit = commit; this.commit = commit;
this.reset = reset; this.reset = reset;
this.disable = disable;
this.enable = enable;
this.isEnabled = isEnabled;
function registerObserver(ref, types){ function registerObserver(ref, types){
@ -295,4 +298,35 @@ Zotero.Notifier = new function(){
_queue = []; _queue = [];
_inTransaction = false; _inTransaction = false;
} }
//
// These should rarely be used now that we have event queuing
//
/*
* Disables Notifier notifications
*
* Returns false if the Notifier was already disabled, true otherwise
*/
function disable() {
if (_disabled) {
Zotero.debug('Notifier notifications are already disabled');
return false;
}
Zotero.debug('Disabling Notifier notifications');
_disabled = true;
return true;
}
function enable(enable) {
Zotero.debug('Enabling Notifier notifications');
_disabled = false;
}
function isEnabled() {
return !_disabled;
}
} }