mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixes #310, active focus remains with zotero pane closed

Browse source 
Plus a couple JS strict warnings
This commit is contained in:
Dan Stillman 2006-10-03 19:09:21 +00:00
parent eb94d648d7
commit 49a8d68e60
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/overlay.js
View file

@ -122,6 +122,7 @@ var ZoteroPane = new function()
*/ */
function toggleDisplay() function toggleDisplay()
{ {
// Visible == target visibility
var visible = document.getElementById('zotero-pane').getAttribute('collapsed') == 'true'; var visible = document.getElementById('zotero-pane').getAttribute('collapsed') == 'true';
document.getElementById('zotero-pane').setAttribute('collapsed',!visible); document.getElementById('zotero-pane').setAttribute('collapsed',!visible);
@ -131,6 +132,9 @@ var ZoteroPane = new function()
{ {
document.getElementById('content').setAttribute('collapsed', false); document.getElementById('content').setAttribute('collapsed', false);
document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', false); document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', false);
// Return focus to the browser content pane
window.content.window.focus();
} }
} }

4
chrome/content/zotero/overlay.xul
View file

@ -77,7 +77,7 @@
onselect="ZoteroPane.onCollectionSelected();" seltype="single" onselect="ZoteroPane.onCollectionSelected();" seltype="single"
ondragdrop="nsDragAndDrop.drop(event,ZoteroPane.getCollectionsView())" ondragdrop="nsDragAndDrop.drop(event,ZoteroPane.getCollectionsView())"
ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getCollectionsView());" ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getCollectionsView());"
onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedCollection(); return false; }" onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedCollection(); }"
flex="1"> flex="1">
<treecols> <treecols>
<treecol <treecol
@ -119,7 +119,7 @@
id="items-tree" context="zotero-itemmenu" id="items-tree" context="zotero-itemmenu"
ondblclick="ZoteroPane.onDoubleClick(event, this);" ondblclick="ZoteroPane.onDoubleClick(event, this);"
enableColumnDrag="true" enableColumnDrag="true"
onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedItem(); return false; }" onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedItem(); }"
onselect="ZoteroPane.itemSelected();" onselect="ZoteroPane.itemSelected();"
ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getItemsView());" ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getItemsView());"
ondragover="nsDragAndDrop.dragOver(event,ZoteroPane.getItemsView())" ondragover="nsDragAndDrop.dragOver(event,ZoteroPane.getItemsView())"