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-07-01 15:44:06 -04:00
commit d780350d24
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -1337,7 +1337,8 @@ Zotero.Translate.Base.prototype = {
// https://bugzilla.mozilla.org/show_bug.cgi?id=609143 - can't pass E4X to sandbox in Fx4
src += "Zotero.getXML = function() {"+
"var xml = Zotero._getXML();"+
"if(typeof xml == 'string') return new XML(xml);"+
"if(typeof xml == 'string') { return new XML(xml);}"+
"return xml;"+
"};";
}
}
@ -2229,11 +2230,12 @@ Zotero.Translate.IO.String.prototype = {
"_getXML":function() {
if(this._mode == "xml/dom") {
try {
return Zotero.Translate.IO.parseDOMXML(this.string);
var xml = Zotero.Translate.IO.parseDOMXML(this.string);
} catch(e) {
this._xmlInvalid = true;
throw e;
}
return (Zotero.isFx5 ? Zotero.Translate.SandboxManager.Fx5DOMWrapper(xml) : xml);
} else {
return this.string.replace(/<\?xml[^>]+\?>/, "");
}

8
chrome/content/zotero/xpcom/translation/translate_firefox.js
View file

@ -732,7 +732,13 @@ Zotero.Translate.IO.Read.prototype = {
"_getXML":function() {
if(this._mode == "xml/dom") {
return Zotero.Translate.IO.parseDOMXML(this._rawStream, this._charset, this.file.fileSize);
try {
var xml = Zotero.Translate.IO.parseDOMXML(this._rawStream, this._charset, this.file.fileSize);
} catch(e) {
this._xmlInvalid = true;
throw e;
}
return (Zotero.isFx5 ? Zotero.Translate.SandboxManager.Fx5DOMWrapper(xml) : xml);
} else {
return this._readToString().replace(/<\?xml[^>]+\?>/, "");
}

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

@ -158,7 +158,7 @@ Zotero.Utilities.Translate.prototype.getItemArray = function(doc, inHere, urlRe,
var links = inHere[j].getElementsByTagName("a");
for(var i=0; i<links.length; i++) {
if(!urlRe || urlRegexp.test(links[i].href)) {
var text = links[i].textContent;
var text = "textContent" in links[i] ? links[i].textContent : links[i].innerText;
if(text) {
text = this.trimInternal(text);
if(!rejectRe || !rejectRegexp.test(text)) {