Skip to content

C
coopwire-hypothesis
Commit fbf909d4 authored by csillag's avatar csillag
Browse files
Options

Updated annotator to fca057ce (fix-event-signature branch)

parent d07ea18f
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 69 deletions
h/lib/_annotator_mapsrc/src/plugin/texthighlights.coffee
View file @ fbf909d4
......@@ -19,39 +19,29 @@ class TextHighlight extends Annotator.Highlight
# List of annotators we have already set up events for
@_inited: []
# Collect the annotations impacted by an event
@getAnnotations: (event) ->
TextHighlight.$(event.target)
.parents('.annotator-hl')
.andSelf()
.map( -> TextHighlight.$(this).data("annotation"))
.toArray()
# Set up events for this annotator
@_init: (annotator) ->
return if annotator in @_inited
getAnnotations = (event) ->
# Collect the involved annotations
annotations = TextHighlight.$(event.target)
.parents('.annotator-hl')
.andSelf()
.map -> return TextHighlight.$(this).data("annotation")
# Make a proper array out of the list
TextHighlight.$.makeArray annotations
annotator.element.delegate ".annotator-hl", "mouseover",
type: @highlightType
getAnnotations: (event) => getAnnotations event,
((event) => annotator.onAnchorMouseover event)
annotator.element.delegate ".annotator-hl", "mouseout",
type: @highlightType
getAnnotations: (event) => getAnnotations event,
((event) => annotator.onAnchorMouseout event)
annotator.element.delegate ".annotator-hl", "mousedown",
type: @highlightType
getAnnotations: (event) => getAnnotations event,
((event) => annotator.onAnchorMousedown event)
annotator.element.delegate ".annotator-hl", "click",
type: @highlightType
getAnnotations: (event) => getAnnotations event,
((event) => annotator.onAnchorClick event)
annotator.element.delegate ".annotator-hl", "mouseover", this,
(event) => annotator.onAnchorMouseover event
annotator.element.delegate ".annotator-hl", "mouseout", this,
(event) => annotator.onAnchorMouseout event
annotator.element.delegate ".annotator-hl", "mousedown", this,
(event) => annotator.onAnchorMousedown event
annotator.element.delegate ".annotator-hl", "click", this,
(event) => annotator.onAnchorClick event
@_inited.push annotator
......
h/lib/annotator.texthighlights.js
View file @ fbf909d4
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-04d1465
** Annotator 1.2.6-dev-8b9bc0e
** 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: 2014-03-31 18:02:58Z
** Built at: 2014-03-31 22:37:06Z
*/
......@@ -42,51 +42,29 @@
TextHighlight._inited = [];
TextHighlight.getAnnotations = function(event) {
return TextHighlight.$(event.target).parents('.annotator-hl').andSelf().map(function() {
return TextHighlight.$(this).data("annotation");
}).toArray();
};
TextHighlight._init = function(annotator) {
var getAnnotations,
_this = this;
var _this = this;
if (__indexOf.call(this._inited, annotator) >= 0) {
return;
}
getAnnotations = function(event) {
var annotations;
annotations = TextHighlight.$(event.target).parents('.annotator-hl').andSelf().map(function() {
return TextHighlight.$(this).data("annotation");
});
return TextHighlight.$.makeArray(annotations);
};
annotator.element.delegate(".annotator-hl", "mouseover", {
type: this.highlightType,
getAnnotations: function(event) {
return getAnnotations(event);
}
}, (function(event) {
annotator.element.delegate(".annotator-hl", "mouseover", this, function(event) {
return annotator.onAnchorMouseover(event);
}));
annotator.element.delegate(".annotator-hl", "mouseout", {
type: this.highlightType,
getAnnotations: function(event) {
return getAnnotations(event);
}
}, (function(event) {
});
annotator.element.delegate(".annotator-hl", "mouseout", this, function(event) {
return annotator.onAnchorMouseout(event);
}));
annotator.element.delegate(".annotator-hl", "mousedown", {
type: this.highlightType,
getAnnotations: function(event) {
return getAnnotations(event);
}
}, (function(event) {
});
annotator.element.delegate(".annotator-hl", "mousedown", this, function(event) {
return annotator.onAnchorMousedown(event);
}));
annotator.element.delegate(".annotator-hl", "click", {
type: this.highlightType,
getAnnotations: function(event) {
return getAnnotations(event);
}
}, (function(event) {
});
annotator.element.delegate(".annotator-hl", "click", this, function(event) {
return annotator.onAnchorClick(event);
}));
});
return this._inited.push(annotator);
};
......
h/lib/annotator.texthighlights.map
View file @ fbf909d4
{"version":3,"file":"annotator.texthighlights.js","sources":["_preamble.coffee","_annotator_mapsrc/src/plugin/texthighlights.coffee"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"annotator.texthighlights.js","sources":["_preamble.coffee","_annotator_mapsrc/src/plugin/texthighlights.coffee"],"names":[],"mappings":"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"}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment