Commit ba07dd32 authored by Nick Stenning's avatar Nick Stenning

Upgrade to Annotator v1.2.x tip (368b5cf)

parent 8381000a
/* /*
** Annotator v1.2.9-dev-b091a74 ** Annotator v1.2.9-dev-368b5cf
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2015, the Annotator project contributors. ** Copyright 2015, the Annotator project contributors.
** Dual licensed under the MIT and GPLv3 licenses. ** Dual licensed under the MIT and GPLv3 licenses.
** https://github.com/okfn/annotator/blob/master/LICENSE ** https://github.com/okfn/annotator/blob/master/LICENSE
** **
** Built at: 2015-01-19 11:35:26Z ** Built at: 2015-01-19 16:53:10Z
*/ */
......
/* /*
** Annotator v1.2.9-dev-b091a74 ** Annotator v1.2.9-dev-368b5cf
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2015, the Annotator project contributors. ** Copyright 2015, the Annotator project contributors.
** Dual licensed under the MIT and GPLv3 licenses. ** Dual licensed under the MIT and GPLv3 licenses.
** https://github.com/okfn/annotator/blob/master/LICENSE ** https://github.com/okfn/annotator/blob/master/LICENSE
** **
** Built at: 2015-01-19 11:35:26Z ** Built at: 2015-01-19 16:53:10Z
*/ */
......
/* /*
** Annotator v1.2.9-dev-b091a74 ** Annotator v1.2.9-dev-368b5cf
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2015, the Annotator project contributors. ** Copyright 2015, the Annotator project contributors.
** Dual licensed under the MIT and GPLv3 licenses. ** Dual licensed under the MIT and GPLv3 licenses.
** https://github.com/okfn/annotator/blob/master/LICENSE ** https://github.com/okfn/annotator/blob/master/LICENSE
** **
** Built at: 2015-01-19 11:35:26Z ** Built at: 2015-01-19 16:53:10Z
*/ */
...@@ -1236,9 +1236,6 @@ ...@@ -1236,9 +1236,6 @@
for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) { for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) {
range = _ref1[_k]; range = _ref1[_k];
container = range.commonAncestor; container = range.commonAncestor;
if ($(container).hasClass('annotator-hl')) {
container = $(container).parents('[class!=annotator-hl]')[0];
}
if (this.isAnnotator(container)) { if (this.isAnnotator(container)) {
return; return;
} }
...@@ -1251,7 +1248,7 @@ ...@@ -1251,7 +1248,7 @@
}; };
Annotator.prototype.isAnnotator = function(element) { Annotator.prototype.isAnnotator = function(element) {
return !!$(element).parents().addBack().filter('[class^=annotator-]').not(this.wrapper).length; return !!$(element).parents().addBack().filter('[class^=annotator-]').not('[class=annotator-hl]').not(this.wrapper).length;
}; };
Annotator.prototype.onHighlightMouseover = function(event) { Annotator.prototype.onHighlightMouseover = function(event) {
......
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