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

Renamed Notifier.[un]register(Item|Column)Tree() to [un]register(Item|Collection)Observer(), which is more accurate

Browse Source
This commit is contained in:
Dan Stillman 2006-10-05 01:25:36 +00:00
parent cd26267afe
commit e2e5d59f61
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/note.js
View File

@ -60,7 +60,7 @@ function onLoad()
noteEditor.collection = Zotero.Collections.get(collectionID); noteEditor.collection = Zotero.Collections.get(collectionID);
} }
notifierUnregisterID = Zotero.Notifier.registerItemTree(NotifyCallback); notifierUnregisterID = Zotero.Notifier.registerItemObserver(NotifyCallback);
} }
function onUnload() function onUnload()
@ -68,7 +68,7 @@ function onUnload()
if(noteEditor && noteEditor.value) if(noteEditor && noteEditor.value)
noteEditor.save(); noteEditor.save();
Zotero.Notifier.unregisterItemTree(notifierUnregisterID); Zotero.Notifier.unregisterItemObserver(notifierUnregisterID);
} }
var NotifyCallback = { var NotifyCallback = {

4
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -36,7 +36,7 @@ Zotero.CollectionTreeView = function()
this._treebox = null; this._treebox = null;
this.refresh(); this.refresh();
this._unregisterID = Zotero.Notifier.registerColumnTree(this); this._unregisterID = Zotero.Notifier.registerCollectionObserver(this);
} }
/* /*
@ -209,7 +209,7 @@ Zotero.CollectionTreeView.prototype.notify = function(action, type, ids)
*/ */
Zotero.CollectionTreeView.prototype.unregister = function() Zotero.CollectionTreeView.prototype.unregister = function()
{ {
Zotero.Notifier.unregisterColumnTree(this._unregisterID); Zotero.Notifier.unregisterCollectionObserver(this._unregisterID);
} }
Zotero.CollectionTreeView.prototype.isLibrary = function(row) Zotero.CollectionTreeView.prototype.isLibrary = function(row)

4
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -39,7 +39,7 @@ Zotero.ItemTreeView = function(itemGroup, sourcesOnly)
this._treebox = null; this._treebox = null;
this.refresh(); this.refresh();
this._unregisterID = Zotero.Notifier.registerItemTree(this); this._unregisterID = Zotero.Notifier.registerItemObserver(this);
} }
/* /*
@ -270,7 +270,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
*/ */
Zotero.ItemTreeView.prototype.unregister = function() Zotero.ItemTreeView.prototype.unregister = function()
{ {
Zotero.Notifier.unregisterItemTree(this._unregisterID); Zotero.Notifier.unregisterItemObserver(this._unregisterID);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

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

@ -23,32 +23,32 @@
Zotero.Notifier = new function(){ Zotero.Notifier = new function(){
var _observers = new Array(); var _observers = new Array();
var _disabled = false; var _disabled = false;
_observers['columnTree'] = new Zotero.Hash(); _observers['collectionObserver'] = new Zotero.Hash();
_observers['itemTree'] = new Zotero.Hash(); _observers['itemObserver'] = new Zotero.Hash();
this.registerColumnTree = registerColumnTree; this.registerCollectionObserver = registerCollectionObserver;
this.registerItemTree = registerItemTree; this.registerItemObserver = registerItemObserver;
this.unregisterColumnTree = unregisterColumnTree; this.unregisterCollectionObserver = unregisterCollectionObserver;
this.unregisterItemTree = unregisterItemTree; this.unregisterItemObserver = unregisterItemObserver;
this.trigger = trigger; this.trigger = trigger;
this.disable = disable; this.disable = disable;
this.enable = enable; this.enable = enable;
this.isEnabled = isEnabled; this.isEnabled = isEnabled;
function registerColumnTree(ref){ function registerCollectionObserver(ref){
return _register('columnTree', ref); return _register('collectionObserver', ref);
} }
function registerItemTree(ref){ function registerItemObserver(ref){
return _register('itemTree', ref); return _register('itemObserver', ref);
} }
function unregisterColumnTree(hash){ function unregisterCollectionObserver(hash){
_unregister('columnTree', hash); _unregister('collectionObserver', hash);
} }
function unregisterItemTree(hash){ function unregisterItemObserver(hash){
_unregister('itemTree', hash); _unregister('itemObserver', hash);
} }
/** /**
@ -63,11 +63,11 @@ Zotero.Notifier = new function(){
switch (type){ switch (type){
case 'item': case 'item':
var treeType = 'itemTree'; var observerType = 'itemObserver';
break; break;
case 'collection': case 'collection':
case 'search': case 'search':
var treeType = 'columnTree'; var observerType = 'collectionObserver';
break; break;
default: default:
throw('Invalid type ' + type + ' in Notifier.trigger()'); throw('Invalid type ' + type + ' in Notifier.trigger()');
@ -75,13 +75,13 @@ Zotero.Notifier = new function(){
Zotero.debug("Notifier.trigger('" + event + "', '" + type + "', " Zotero.debug("Notifier.trigger('" + event + "', '" + type + "', "
+ (typeof ids=='object' ? '[' + ids.join() + ']' : ids) + ") called " + (typeof ids=='object' ? '[' + ids.join() + ']' : ids) + ") called "
+ "[column trees: " + _observers['columnTree'].length + "[collection observers: " + _observers['collectionObserver'].length
+ ", item trees: " + _observers['itemTree'].length + "]"); + ", item observers: " + _observers['itemObserver'].length + "]");
for (i in _observers[treeType].items){ for (i in _observers[observerType].items){
Zotero.debug("Calling notify() on " + treeType + " with hash '" Zotero.debug("Calling notify() on " + observerType + " with hash '"
+ i + "'", 4); + i + "'", 4);
_observers[treeType].get(i).notify(event, type, ids); _observers[observerType].get(i).notify(event, type, ids);
} }
return true; return true;