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

Fixes #481, Deleting tag with tag-selected item makes library seem to disappear

Browse Source 
Fixed some subtle tag issues, hopefully without causing new ones:

1) If no tags visible after a delete, deselect all
2) If a selected tag is deleted, deselect it
3) If a selected tag goes out of scope in Display All mode, deselect it (otherwise a tag stays selected after removing an item with that tag from the current collection)
This commit is contained in:
Dan Stillman 2007-01-05 21:08:37 +00:00
parent 486d55a2e8
commit ed6348ee31
1 changed files with 58 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
chrome/content/zotero/bindings/tagselector.xml
View File

@ -37,6 +37,7 @@
<field name="_notifierID">false</field> <field name="_notifierID">false</field>
<field name="_tags">null</field> <field name="_tags">null</field>
<field name="_dirty">null</field> <field name="_dirty">null</field>
<field name="_empty">null</field>
<field name="selection"/> <field name="selection"/>
<field name="_hasFilter">false</field> <field name="_hasFilter">false</field>
@ -108,7 +109,7 @@
<![CDATA[ <![CDATA[
this._initialized = true; this._initialized = true;
this.selection = {}; this.selection = {};
this._notifierID = Zotero.Notifier.registerObserver(this); this._notifierID = Zotero.Notifier.registerObserver(this, ['collection-item', 'item-tag', 'tag']);
]]> ]]>
</body> </body>
</method> </method>
@ -219,6 +220,16 @@
else { else {
//Zotero.debug(5); //Zotero.debug(5);
labels[i].setAttribute('inScope', false); labels[i].setAttribute('inScope', false);
// If out of scope, make sure it's not selected (otherwise a tag
// stays selected after removing an item with that tag from the
// current collection)
if (this.selection[labels[i].value]) {
labels[i].setAttribute('selected', false);
delete this.selection[labels[i].value];
var doCommand = true;
}
} }
labels[i].setAttribute('hidden', false); labels[i].setAttribute('hidden', false);
@ -226,21 +237,37 @@
} }
} }
this.updateNumSelected(); this.updateNumSelected();
this._empty = empty;
this.id('tags-toggle').setAttribute('collapsed', empty); this.id('tags-toggle').setAttribute('collapsed', empty);
this.id('no-tags-box').setAttribute('collapsed', !empty); this.id('no-tags-box').setAttribute('collapsed', !empty);
if (doCommand) {
Zotero.debug('A selected tag went out of scope -- deselecting');
this.doCommand();
}
]]> ]]>
</body> </body>
</method> </method>
<method name="updateNumSelected"> <method name="getNumSelected">
<body> <body>
<![CDATA[ <![CDATA[
var count = 0; var count = 0;
for (var i in this.selection) { for (var i in this.selection) {
count++; count++;
} }
return count;
]]>
</body>
</method>
<method name="updateNumSelected">
<body>
<![CDATA[
var count = this.getNumSelected();
switch (count) { switch (count) {
case 0: case 0:
@ -265,13 +292,35 @@
<parameter name="ids"/> <parameter name="ids"/>
<body> <body>
<![CDATA[ <![CDATA[
// If a selected tag no longer exists, deselect it
if (event == 'delete') {
this._tags = Zotero.Tags.getAll();
for (var tag in this.selection) {
for each(var tag2 in this._tags) {
if (tag == tag2) {
var found = true;
break;
}
}
if (!found) {
delete this.selection[tag];
}
}
}
// This could be more optimized to insert new/changed tags at the appropriate // This could be more optimized to insert new/changed tags at the appropriate
// spot if we cared, but we probably don't // spot if we cared, but we probably don't
if (type == 'collection-item' || type == 'item-tag' || type == 'tag') { var t = this.id('tags-search').inputField;
var t = this.id('tags-search').inputField; this.setFilterTags(Zotero.Tags.search(t.value), true);
this.setFilterTags(Zotero.Tags.search(t.value), true); this._dirty = true;
this._dirty = true; this.doCommand();
this.doCommand();
// If no tags visible after a delete, deselect all
if ((event == 'remove' || event == 'delete') &&
this._empty && this.getNumSelected()) {
Zotero.debug('No tags visible after delete -- deselecting all');
this.clearAll();
} }
]]> ]]>
</body> </body>
@ -309,7 +358,7 @@
delete this.selection[labels[i].value]; delete this.selection[labels[i].value];
} }
// Bubbles up to command this.doCommand();
]]> ]]>
</body> </body>
</method> </method>
@ -539,7 +588,7 @@
<xul:toolbarseparator/> <xul:toolbarseparator/>
<xul:hbox pack="center"> <xul:hbox pack="center">
<xul:button label="&zotero.tagSelector.clearAll;" <xul:button label="&zotero.tagSelector.clearAll;"
oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll();"/> oncommand="this.parentNode.parentNode.parentNode.parentNode.clearAll(); event.stopPropagation();"/>
</xul:hbox> </xul:hbox>
</xul:hbox> </xul:hbox>
</xul:groupbox> </xul:groupbox>