upgrade annotator to 1.2.6-dev-d2ea449

h/js/services.coffee

@@ -4,6 +4,7 @@ class Hypothesis extends Annotator
 
   # Plugin configuration
   options:
+    noMatching: true
     Discovery: {}
     Heatmap: {}
     Permissions:

h/lib/annotator.auth.js

 /*
-** Annotator 1.2.6-dev-8daf38c
+** Annotator 1.2.6-dev-d2ea449
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2013-05-17 21:32:30Z
+** Built at: 2013-05-24 21:48:00Z
 */
 
 

h/lib/annotator.permissions.js

 /*
-** Annotator 1.2.6-dev-8daf38c
+** Annotator 1.2.6-dev-d2ea449
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2013-05-17 21:32:32Z
+** Built at: 2013-05-24 21:48:00Z
 */
 
 

h/lib/annotator.store.js

 /*
-** Annotator 1.2.6-dev-8daf38c
+** Annotator 1.2.6-dev-d2ea449
 ** https://github.com/okfn/annotator/
 **
 ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
 ** Dual licensed under the MIT and GPLv3 licenses.
 ** https://github.com/okfn/annotator/blob/master/LICENSE
 **
-** Built at: 2013-05-17 21:32:33Z
+** Built at: 2013-05-24 21:48:01Z
 */
 
 
@@ -124,11 +124,29 @@
     };
 
     Store.prototype._onLoadAnnotations = function(data) {
+      var a, annotation, annotationMap, newData, _i, _j, _len, _len1, _ref;
+
       if (data == null) {
         data = [];
       }
-      this.annotations = this.annotations.concat(data);
-      return this.annotator.loadAnnotations(data.slice());
+      annotationMap = {};
+      _ref = this.annotations;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        a = _ref[_i];
+        annotationMap[a.id] = a;
+      }
+      newData = [];
+      for (_j = 0, _len1 = data.length; _j < _len1; _j++) {
+        a = data[_j];
+        if (annotationMap[a.id]) {
+          annotation = annotationMap[a.id];
+          this.updateAnnotation(annotation, a);
+        } else {
+          newData.push(a);
+        }
+      }
+      this.annotations = this.annotations.concat(newData);
+      return this.annotator.loadAnnotations(newData.slice());
     };
 
     Store.prototype.loadAnnotationsFromSearch = function(searchOptions) {

h/lib/dom_text_mapper.coffee

@@ -11,7 +11,7 @@ class window.DomTextMapper
     if @instances.length is 0 then return
 #    dm = @instances[0]
 #    console.log "Node @ " + (dm.getPathTo node) + " has changed: " + reason
-    for instance in @instances
+    for instance in @instances when instance.rootNode.contains(node)
       instance.performUpdateOnNode node
     null
 
@@ -42,7 +42,7 @@ class window.DomTextMapper
       throw new Error "Can't find iframe with specified ID!"
     @rootWin = iframe.contentWindow
     unless @rootWin?
-      throw new Error "Can't access contents of the spefified iframe!"
+      throw new Error "Can't access contents of the specified iframe!"
     @rootNode = @rootWin.document
     @pathStartNode = @getBody()
 
@@ -87,6 +87,10 @@ class window.DomTextMapper
 #      console.log "We have a valid DOM structure cache."
       return @path
 
+    unless @pathStartNode.ownerDocument.body.contains @pathStartNode
+      # We cannot map nodes that are not attached.
+      return @path
+
 #    console.log "No valid cache, will have to do a scan."
     startTime = @timestamp()
     @saveSelection()
@@ -195,7 +199,10 @@ class window.DomTextMapper
     result
 
   # Return info for a given node in the DOM
-  getInfoForNode: (node) -> @getInfoForPath @getPathTo node
+  getInfoForNode: (node) ->
+    unless node?
+      throw new Error "Called getInfoForNode(node) with null node!"
+    @getInfoForPath @getPathTo node
 
   # Get the matching DOM elements for a given set of charRanges
   # (Calles getMappingsForCharRange for each element in the givenl ist)
@@ -384,6 +391,8 @@ class window.DomTextMapper
   getPathTo: (node) ->
     xpath = '';
     while node != @rootNode
+      unless node?
+        throw new Error "Called getPathTo on a node which was not a descendant of @rootNode. " + @rootNode
       xpath = (@getPathSegment node) + '/' + xpath
       node = node.parentNode
     xpath = (if @rootNode.ownerDocument? then './' else '/') + xpath
@@ -612,8 +621,7 @@ class window.DomTextMapper
   # Returns:
   #    the first character offset position in the content of this node's
   #    parent node that is not accounted for by this node
-  collectPositions: (node, path, parentContent = null,
-      parentIndex = 0, index = 0) ->
+  collectPositions: (node, path, parentContent = null, parentIndex = 0, index = 0) ->
 #    console.log "Scanning path " + path    
 #    content = @getNodeContent node, false
 

h/lib/dom_text_matcher.coffee

@@ -110,8 +110,7 @@ class window.DomTextMatcher
   # 
   # For the details about the returned data structure,
   # see the documentation of the search() method.
-  searchFuzzy: (pattern, pos,
-      caseSensitive = false, path = null, options = {}) ->
+  searchFuzzy: (pattern, pos, caseSensitive = false, path = null, options = {}) ->
     @ensureDMP()
     @dmp.setMatchDistance options.matchDistance ? 1000
     @dmp.setMatchThreshold options.matchThreshold ? 0.5
@@ -122,9 +121,7 @@ class window.DomTextMatcher
   # Used to even out some browser differences.  
   normalizeString: (string) -> string.replace /\s{2,}/g, " "
 
-  searchFuzzyWithContext: (prefix, suffix, pattern,
-      expectedStart = null, expectedEnd = null, caseSensitive = false,
-      path = null, options = {}) ->
+  searchFuzzyWithContext: (prefix, suffix, pattern, expectedStart = null, expectedEnd = null, caseSensitive = false, path = null, options = {}) ->
     @ensureDMP()
 
     # No context, to joy