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

Merge branch '3.0'

Browse source
This commit is contained in:
Simon Kornblith 2012-02-12 18:10:19 -05:00
commit dc4a448780
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/itemPane.xul
View file

@ -109,7 +109,7 @@
<groupbox id="zotero-duplicates-merge-version-select">
<description>Choose the version of the item to use as the master item:</description>
<hbox>
<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)"/>
<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
</hbox>
</groupbox>

13
chrome/content/zotero/xpcom/citeproc.js
View file

@ -2133,7 +2133,7 @@ CSL.DateParser = function () {
};
CSL.Engine = function (sys, style, lang, forceLang) {
var attrs, langspec, localexml, locale;
this.processor_version = "1.0.278";
this.processor_version = "1.0.279";
this.csl_version = "1.0";
this.sys = sys;
this.sys.xml = new CSL.System.Xml.Parsing();
@ -7506,6 +7506,8 @@ CSL.Node.text = {
if (parseInt(m[1]) >= parseInt(m[2])) {
locator = m[1] + "-" + m[2];
}
} else {
locator = locator.replace(/\u2013/g,"-");
}
state.output.append(locator, this, false, false, true);
}
@ -7527,6 +7529,15 @@ CSL.Node.text = {
func = function (state, Item) {
var value = state.getVariable(Item, "page", form);
if (value) {
value = value.replace(/--*/g,"\u2013");
var m = value.match(/^([0-9]+)\s*\u2013\s*([0-9]+)$/)
if (m) {
if (parseInt(m[1]) >= parseInt(m[2])) {
value = m[1] + "-" + m[2];
}
} else {
value = value.replace(/\u2013/g,"-");
}
value = state.fun.page_mangler(value);
state.output.append(value, this, false, false, true);
}

2
chrome/content/zotero/xpcom/integration.js
View file

@ -1620,7 +1620,7 @@ Zotero.Integration.Fields.prototype.addEditCitation = function(field, callback)
try {
session.lookupItems(citation);
} catch(e) {
if(e instanceof MissingItemException) {
if(e instanceof Zotero.Integration.MissingItemException) {
citation.citationItems = [];
} else {
throw e;