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

nsITreeSelection can be 0 incorrectly even if count is 0

Browse Source
This commit is contained in:
Dan Stillman 2016-03-13 20:30:24 -04:00
parent d86b622c0a
commit 4fcf0c3c15
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,9 @@ Zotero.CollectionTreeView.prototype.type = 'collection';
Object.defineProperty(Zotero.CollectionTreeView.prototype, "selectedTreeRow", { Object.defineProperty(Zotero.CollectionTreeView.prototype, "selectedTreeRow", {
get: function () { get: function () {
if (!this.selection || !this.selection.count) {
return false;
}
return this.getRow(this.selection.currentIndex); return this.getRow(this.selection.currentIndex);
} }
}); });
@ -940,7 +943,7 @@ Zotero.CollectionTreeView.prototype.selectLibrary = Zotero.Promise.coroutine(fun
} }
// Check if library is already selected // Check if library is already selected
if (this.selection.currentIndex != -1) { if (this.selection && this.selection.count && this.selection.currentIndex != -1) {
var treeRow = this.getRow(this.selection.currentIndex); var treeRow = this.getRow(this.selection.currentIndex);
if (treeRow.isLibrary(true) && treeRow.ref.libraryID == libraryID) { if (treeRow.isLibrary(true) && treeRow.ref.libraryID == libraryID) {
this._treebox.ensureRowIsVisible(this.selection.currentIndex); this._treebox.ensureRowIsVisible(this.selection.currentIndex);
@ -972,7 +975,7 @@ Zotero.CollectionTreeView.prototype.selectSearch = function (id) {
Zotero.CollectionTreeView.prototype.selectTrash = Zotero.Promise.coroutine(function* (libraryID) { Zotero.CollectionTreeView.prototype.selectTrash = Zotero.Promise.coroutine(function* (libraryID) {
// Check if trash is already selected // Check if trash is already selected
if (this.selection.currentIndex != -1) { if (this.selection && this.selection.count && this.selection.currentIndex != -1) {
let itemGroup = this.getRow(this.selection.currentIndex); let itemGroup = this.getRow(this.selection.currentIndex);
if (itemGroup.isTrash() && itemGroup.ref.libraryID == libraryID) { if (itemGroup.isTrash() && itemGroup.ref.libraryID == libraryID) {
this._treebox.ensureRowIsVisible(this.selection.currentIndex); this._treebox.ensureRowIsVisible(this.selection.currentIndex);
@ -1196,6 +1199,8 @@ Zotero.CollectionTreeView.prototype._expandRow = Zotero.Promise.coroutine(functi
* Returns libraryID or FALSE if not a library * Returns libraryID or FALSE if not a library
*/ */
Zotero.CollectionTreeView.prototype.getSelectedLibraryID = function() { Zotero.CollectionTreeView.prototype.getSelectedLibraryID = function() {
if (!this.selection || !this.selection.count || this.selection.currentIndex == -1) return false;
var treeRow = this.getRow(this.selection.currentIndex); var treeRow = this.getRow(this.selection.currentIndex);
return treeRow && treeRow.ref && treeRow.ref.libraryID !== undefined return treeRow && treeRow.ref && treeRow.ref.libraryID !== undefined
&& treeRow.ref.libraryID; && treeRow.ref.libraryID;