- Don't sizeToContent() in Standalone window
- Fix expand/collapse item
This commit is contained in:
parent
b27e64f9c8
commit
914f29b8ac
|
@ -44,7 +44,6 @@
|
||||||
|
|
||||||
<window id="main-window"
|
<window id="main-window"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
onload="window.sizeToContent()"
|
|
||||||
windowtype="navigator:browser"
|
windowtype="navigator:browser"
|
||||||
title="&brandShortName;"
|
title="&brandShortName;"
|
||||||
width="900" height="500"
|
width="900" height="500"
|
||||||
|
|
|
@ -124,18 +124,19 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
|
||||||
|
|
||||||
// Add a keypress listener for expand/collapse
|
// Add a keypress listener for expand/collapse
|
||||||
var tree = this._treebox.treeBody.parentNode;
|
var tree = this._treebox.treeBody.parentNode;
|
||||||
|
var me = this;
|
||||||
var listener = function(event) {
|
var listener = function(event) {
|
||||||
// Handle arrow keys specially on multiple selection, since
|
// Handle arrow keys specially on multiple selection, since
|
||||||
// otherwise the tree just applies it to the last-selected row
|
// otherwise the tree just applies it to the last-selected row
|
||||||
if (event.keyCode == 39 || event.keyCode == 37) {
|
if (event.keyCode == 39 || event.keyCode == 37) {
|
||||||
if (this._treebox.view.selection.count > 1) {
|
if (me._treebox.view.selection.count > 1) {
|
||||||
switch (event.keyCode) {
|
switch (event.keyCode) {
|
||||||
case 39:
|
case 39:
|
||||||
this.expandSelectedRows();
|
me.expandSelectedRows();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 37:
|
case 37:
|
||||||
this.collapseSelectedRows();
|
me.collapseSelectedRows();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,12 +148,12 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
|
||||||
|
|
||||||
var key = String.fromCharCode(event.which);
|
var key = String.fromCharCode(event.which);
|
||||||
if (key == '+' && !(event.ctrlKey || event.altKey || event.metaKey)) {
|
if (key == '+' && !(event.ctrlKey || event.altKey || event.metaKey)) {
|
||||||
this.expandAllRows();
|
me.expandAllRows();
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (key == '-' && !(event.shiftKey || event.ctrlKey || event.altKey || event.metaKey)) {
|
else if (key == '-' && !(event.shiftKey || event.ctrlKey || event.altKey || event.metaKey)) {
|
||||||
this.collapseAllRows();
|
me.collapseAllRows();
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user