(Hopefully) fix QuickFormat box sizing once and for all
This commit is contained in:
parent
251da6ce50
commit
aa07db50a1
2 changed files with 4 additions and 4 deletions
chrome/content/zotero/integration
|
@ -522,7 +522,6 @@ var Zotero_QuickFormat = new function () {
|
||||||
// add to rich list item
|
// add to rich list item
|
||||||
var rll = document.createElement("richlistitem");
|
var rll = document.createElement("richlistitem");
|
||||||
rll.setAttribute("orient", "vertical");
|
rll.setAttribute("orient", "vertical");
|
||||||
rll.setAttribute("flex", "1");
|
|
||||||
rll.setAttribute("class", "quick-format-item");
|
rll.setAttribute("class", "quick-format-item");
|
||||||
rll.setAttribute("zotero-item", item.cslItemID ? item.cslItemID : item.id);
|
rll.setAttribute("zotero-item", item.cslItemID ? item.cslItemID : item.id);
|
||||||
rll.appendChild(titleNode);
|
rll.appendChild(titleNode);
|
||||||
|
@ -545,7 +544,6 @@ var Zotero_QuickFormat = new function () {
|
||||||
// add to rich list item
|
// add to rich list item
|
||||||
var rll = document.createElement("richlistitem");
|
var rll = document.createElement("richlistitem");
|
||||||
rll.setAttribute("orient", "vertical");
|
rll.setAttribute("orient", "vertical");
|
||||||
rll.setAttribute("flex", "1");
|
|
||||||
rll.setAttribute("disabled", true);
|
rll.setAttribute("disabled", true);
|
||||||
rll.setAttribute("class", loading ? "quick-format-loading" : "quick-format-separator");
|
rll.setAttribute("class", loading ? "quick-format-loading" : "quick-format-separator");
|
||||||
rll.appendChild(titleNode);
|
rll.appendChild(titleNode);
|
||||||
|
@ -718,6 +716,7 @@ var Zotero_QuickFormat = new function () {
|
||||||
null, false, false, null);
|
null, false, false, null);
|
||||||
panelShowing = true;
|
panelShowing = true;
|
||||||
referenceHeight = firstReference.scrollHeight;
|
referenceHeight = firstReference.scrollHeight;
|
||||||
|
if(firstReference === referenceBox.lastChild) referenceHeight += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!separatorHeight && firstSeparator) {
|
if(!separatorHeight && firstSeparator) {
|
||||||
|
@ -725,10 +724,11 @@ var Zotero_QuickFormat = new function () {
|
||||||
null, false, false, null);
|
null, false, false, null);
|
||||||
panelShowing = true;
|
panelShowing = true;
|
||||||
separatorHeight = firstSeparator.scrollHeight;
|
separatorHeight = firstSeparator.scrollHeight;
|
||||||
|
if(firstSeparator === referenceBox.lastChild) separatorHeight += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
referencePanel.sizeTo(window.outerWidth-30,
|
referencePanel.sizeTo(window.outerWidth-30,
|
||||||
numReferences*referenceHeight+1+numSeparators*separatorHeight);
|
numReferences*referenceHeight+1+numSeparators*separatorHeight-1);
|
||||||
if(!panelShowing) referencePanel.openPopup(document.documentElement, "after_start", 15,
|
if(!panelShowing) referencePanel.openPopup(document.documentElement, "after_start", 15,
|
||||||
null, false, false, null);
|
null, false, false, null);
|
||||||
} else if(panelShowing) {
|
} else if(panelShowing) {
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
</deck>
|
</deck>
|
||||||
</windowdragbox>
|
</windowdragbox>
|
||||||
<panel id="quick-format-reference-panel" noautofocus="true" norestorefocus="true" noautohide="true" height="0">
|
<panel id="quick-format-reference-panel" noautofocus="true" norestorefocus="true" noautohide="true" height="0">
|
||||||
<richlistbox id="quick-format-reference-list"/>
|
<richlistbox id="quick-format-reference-list" flex="1"/>
|
||||||
</panel>
|
</panel>
|
||||||
<panel id="citation-properties" type="arrow" orient="vertical"
|
<panel id="citation-properties" type="arrow" orient="vertical"
|
||||||
onkeypress="Zotero_QuickFormat.onPanelKeyPress(event)"
|
onkeypress="Zotero_QuickFormat.onPanelKeyPress(event)"
|
||||||
|
|
Loading…
Add table
Reference in a new issue