Merge branch '3.0'
This commit is contained in:
commit
9159e1c635
2 changed files with 2 additions and 2 deletions
|
@ -2196,7 +2196,7 @@ Zotero.Translate.IO.String.prototype = {
|
||||||
if(lfIndex !== -1) {
|
if(lfIndex !== -1) {
|
||||||
// in case we have a CRLF
|
// in case we have a CRLF
|
||||||
this.bytesRead = lfIndex+1;
|
this.bytesRead = lfIndex+1;
|
||||||
if(this.contentLength > lfIndex && this.string[lfIndex-1] === "\r") {
|
if(this.contentLength > lfIndex && this.string.substr(lfIndex-1, 1) === "\r") {
|
||||||
lfIndex--;
|
lfIndex--;
|
||||||
}
|
}
|
||||||
return this.string.substr(oldPointer, lfIndex-oldPointer);
|
return this.string.substr(oldPointer, lfIndex-oldPointer);
|
||||||
|
|
|
@ -686,7 +686,7 @@ Zotero.Utilities = {
|
||||||
} else {
|
} else {
|
||||||
// this is not a skip word or comes after a colon;
|
// this is not a skip word or comes after a colon;
|
||||||
// we must capitalize
|
// we must capitalize
|
||||||
words[i] = upperCaseVariant[0] + lowerCaseVariant.substr(1);
|
words[i] = upperCaseVariant.substr(0, 1) + lowerCaseVariant.substr(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue