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

Fix broken annotations

Browse source
This commit is contained in:
Dan Stillman 2012-02-01 18:15:29 -05:00
parent 48f90cb8b4
commit 3bd1ff7676
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/xpcom/annotate.js
View file

@ -389,7 +389,7 @@ Zotero.Annotate.Path.prototype.fromNode = function(node, offset) {
} }
if(!node) throw "Annotate: Path() resolved text offset inappropriately"; if(!node) throw "Annotate: Path() resolved text offset inappropriately";
while(node && !node === this._document) { while(node && node !== this._document) {
var number = 1; var number = 1;
var sibling = node.previousSibling; var sibling = node.previousSibling;
while(sibling) { while(sibling) {
@ -731,10 +731,18 @@ Zotero.Annotations.prototype.save = function() {
// save annotations // save annotations
for each(var annotation in this.annotations) { for each(var annotation in this.annotations) {
annotation.save(); // Don't drop all annotations if one is broken (due to ~3.0 glitch)
try {
annotation.save();
}
catch(e) {
Zotero.debug(e);
continue;
}
} }
Zotero.DB.commitTransaction(); Zotero.DB.commitTransaction();
} catch(e) { } catch(e) {
Zotero.debug(e);
Zotero.DB.rollbackTransaction(); Zotero.DB.rollbackTransaction();
throw(e); throw(e);
} }
@ -1387,7 +1395,7 @@ Zotero.Highlight.prototype.unhighlight = function(container, offset, path, mode)
// loop through, removing nodes // loop through, removing nodes
var node = span.firstChild; var node = span.firstChild;
while(span.firstChild && !span.firstChild === textNode) { while(span.firstChild && span.firstChild !== textNode) {
parentNode.insertBefore(span.removeChild(span.firstChild), span); parentNode.insertBefore(span.removeChild(span.firstChild), span);
} }
} else if(mode == 2) { } else if(mode == 2) {
@ -1437,23 +1445,23 @@ Zotero.Highlight.prototype._highlight = function() {
var onlyOneNode = startNode === endNode; var onlyOneNode = startNode === endNode;
if(!onlyOneNode && !startNode === ancestor && !endNode === ancestor) { if(!onlyOneNode && startNode !== ancestor && endNode !== ancestor) {
// highlight nodes after start node in the DOM hierarchy not at ancestor level // highlight nodes after start node in the DOM hierarchy not at ancestor level
while(startNode.parentNode && !startNode.parentNode === ancestor) { while(startNode.parentNode && startNode.parentNode !== ancestor) {
if(startNode.nextSibling) { if(startNode.nextSibling) {
this._highlightSpaceBetween(startNode.nextSibling, startNode.parentNode.lastChild); this._highlightSpaceBetween(startNode.nextSibling, startNode.parentNode.lastChild);
} }
startNode = startNode.parentNode startNode = startNode.parentNode
} }
// highlight nodes after end node in the DOM hierarchy not at ancestor level // highlight nodes after end node in the DOM hierarchy not at ancestor level
while(endNode.parentNode && !endNode.parentNode === ancestor) { while(endNode.parentNode && endNode.parentNode !== ancestor) {
if(endNode.previousSibling) { if(endNode.previousSibling) {
this._highlightSpaceBetween(endNode.parentNode.firstChild, endNode.previousSibling); this._highlightSpaceBetween(endNode.parentNode.firstChild, endNode.previousSibling);
} }
endNode = endNode.parentNode endNode = endNode.parentNode
} }
// highlight nodes between start node and end node at ancestor level // highlight nodes between start node and end node at ancestor level
if(!startNode === endNode.previousSibling) { if(startNode !== endNode.previousSibling) {
this._highlightSpaceBetween(startNode.nextSibling, endNode.previousSibling); this._highlightSpaceBetween(startNode.nextSibling, endNode.previousSibling);
} }
} }