www

commit 9159e1c635175dbbfe211a1474885a858305f98a
parent 263c54d09b7d0c682fce6310d186e785b918676a
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 18 Jul 2012 15:04:22 -0400

Merge branch '3.0'

Diffstat:
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
2
+-
M
chrome/content/zotero/xpcom/utilities.js
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -2196,7 +2196,7 @@ Zotero.Translate.IO.String.prototype = {
 			if(lfIndex !== -1) {
 				// in case we have a CRLF
 				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--;
 				}
 				return this.string.substr(oldPointer, lfIndex-oldPointer);					
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
@@ -686,7 +686,7 @@ Zotero.Utilities = {
 					} else {
 						// this is not a skip word or comes after a colon;
 						// we must capitalize
-						words[i] = upperCaseVariant[0] + lowerCaseVariant.substr(1);
+						words[i] = upperCaseVariant.substr(0, 1) + lowerCaseVariant.substr(1);
 					}
 				}