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

Closes #154, Clicking an item in Related should display that item.

Browse source 
Cancel Search ('x') button now uses a custom image.
Fixes problem with items list freezing on item add
This commit is contained in:
David Norton 2006-08-02 15:13:31 +00:00
parent f6c12d3d81
commit b79420e75b
6 changed files with 59 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

52
chrome/chromeFiles/content/scholar/bindings/relatedbox.xml
View file

@ -58,15 +58,22 @@
var label = document.createElement("label"); var label = document.createElement("label");
label.setAttribute('value', seealso[i].getField('title')); label.setAttribute('value', seealso[i].getField('title'));
label.setAttribute('crop','end'); label.setAttribute('crop','end');
label.setAttribute('flex','1');
var box = document.createElement('box');
box.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.showItem('"+seealso[i].getID()+"')");
box.setAttribute('class','clicky');
box.setAttribute('flex','1');
box.appendChild(icon);
box.appendChild(label);
var remove = document.createElement("label"); var remove = document.createElement("label");
remove.setAttribute('value','-'); remove.setAttribute('value','-');
remove.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.remove('"+seealso[i].getID()+"');"); remove.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.remove('"+seealso[i].getID()+"');");
remove.setAttribute('class','clicky'); remove.setAttribute('class','clicky');
var row = document.createElement("row"); var row = document.createElement("row");
row.appendChild(icon); row.appendChild(box);
row.appendChild(label);
row.appendChild(remove); row.appendChild(remove);
row.setAttribute('id','seealso-'+seealso[i].getID()); row.setAttribute('id','seealso-'+seealso[i].getID());
rows.appendChild(row); rows.appendChild(row);
@ -111,6 +118,42 @@
]]> ]]>
</body> </body>
</method> </method>
<method name="showItem">
<parameter name="id"/>
<body>
<![CDATA[
if(id)
{
var p;
if(window.ScholarPane)
{
p = window.ScholarPane;
}
else
{
var win;
if(window.opener && window.opener.ScholarPane)
{
win = window.opener;
}
else
{
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
win = wm.getMostRecentWindow('navigator:browser');
if(!win)
return;
}
p = win.ScholarPane;
}
p.selectItem(id);
}
]]>
</body>
</method>
<method name="updateCount"> <method name="updateCount">
<parameter name="count"/> <parameter name="count"/>
<body> <body>
@ -143,9 +186,8 @@
<xul:label id="seeAlsoNum"/> <xul:label id="seeAlsoNum"/>
<xul:button label="Add" oncommand="this.parentNode.parentNode.parentNode.add();"/> <xul:button label="Add" oncommand="this.parentNode.parentNode.parentNode.add();"/>
</xul:hbox> </xul:hbox>
<xul:grid> <xul:grid flex="1">
<xul:columns> <xul:columns>
<xul:column/>
<xul:column flex="1"/> <xul:column flex="1"/>
<xul:column/> <xul:column/>
</xul:columns> </xul:columns>

8
chrome/chromeFiles/content/scholar/itemTreeView.js
View file

@ -141,7 +141,7 @@ Scholar.ItemTreeView.prototype.notify = function(action, type, ids)
if(action == 'add') if(action == 'add')
{ {
this.selectItem(this._itemRowMap[item.getID()]); this.selectItem(item.getID());
} }
else else
{ {
@ -440,12 +440,12 @@ Scholar.ItemTreeView.prototype.sort = function()
*/ */
Scholar.ItemTreeView.prototype.selectItem = function(id) Scholar.ItemTreeView.prototype.selectItem = function(id)
{ {
var item = Scholar.Items.get(id); var row = this._itemRowMap[id];
var row = this._itemRowMap[item.getID()];
if(row == null) if(row == null)
{ {
var item = Scholar.Items.get(id);
this.toggleOpenState(this._itemRowMap[item.getSource()]); //opens the parent of the item this.toggleOpenState(this._itemRowMap[item.getSource()]); //opens the parent of the item
row = this._itemRowMap[item.getID()]; row = this._itemRowMap[id];
} }
this.selection.select(row); this.selection.select(row);

2
chrome/chromeFiles/content/scholar/overlay.xul
View file

@ -93,7 +93,7 @@
<spacer flex="1"/> <spacer flex="1"/>
<label value="&toolbar.search.label;" control="tb-search"/> <label value="&toolbar.search.label;" control="tb-search"/>
<textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_scholar_search'); return false; }"> <textbox id="tb-search" type="timed" timeout="250" command="cmd_scholar_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_scholar_search'); return false; }">
<toolbarbutton id="tb-search-cancel" class="tabs-closebutton" oncommand="this.parentNode.value='';" hidden="true"/> <toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
</textbox> </textbox>
</toolbar> </toolbar>
<hbox id="scholar-search-options" hidden="true"> <hbox id="scholar-search-options" hidden="true">

14
chrome/chromeFiles/skin/default/scholar/overlay.css
View file

@ -133,19 +133,19 @@
#tb-search #tb-search
{ {
width: 150px; width: 150px;
height: 24px;
margin: 0px;
margin-bottom: 2px;
padding: 0px;
vertical-align: middle;
font-size: 12px;
} }
#tb-search-cancel #tb-search-cancel
{ {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
cursor: pointer; cursor: default;
list-style-image: url('chrome://scholar/skin/search-cancel.png');
}
#tb-search-cancel:hover:active
{
list-style-image: url('chrome://scholar/skin/search-cancel-active.png');
} }
#scholar-view-item vbox #scholar-view-item vbox

BIN
chrome/chromeFiles/skin/default/scholar/search-cancel-active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 311 B

BIN
chrome/chromeFiles/skin/default/scholar/search-cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 310 B