# HG changeset patch # User robcast # Date 1424460554 -3600 # Node ID da796a73024ce27090d17f23953fd2fbfb86c45f # Parent 82a0b95c4e228dee1f8c6044129945fa2aadbcd9# Parent 1ad07ddb4bf8fa0468a6f65b05dcba2bd80c7410 Merge with 1ad07ddb4bf8fa0468a6f65b05dcba2bd80c7410 diff -r 1ad07ddb4bf8 -r da796a73024c webapp/src/main/webapp/jquery/annotator-dl.js --- a/webapp/src/main/webapp/jquery/annotator-dl.js Thu Feb 19 01:08:34 2015 +0100 +++ b/webapp/src/main/webapp/jquery/annotator-dl.js Fri Feb 20 20:29:14 2015 +0100 @@ -1,13 +1,13 @@ /* -** Annotator v1.2.9-dev-5096249 +** Annotator v1.2.9-dev-cab39d7 ** https://github.com/okfn/annotator/ ** ** Copyright 2015, the Annotator project contributors. ** Dual licensed under the MIT and GPLv3 licenses. ** https://github.com/okfn/annotator/blob/master/LICENSE ** -** Built at: 2015-01-17 13:38:31Z +** Built at: 2015-02-20 19:20:03Z */ @@ -1237,9 +1237,6 @@ for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) { range = _ref1[_k]; container = range.commonAncestor; - if ($(container).hasClass('annotator-hl')) { - container = $(container).parents('[class!=annotator-hl]')[0]; - } if (this.isAnnotator(container)) { return; } @@ -1252,7 +1249,7 @@ }; 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) { @@ -1597,6 +1594,12 @@ "for": field.id, html: field.label })); + } else if (field.type === 'select') { + element.addClass('annotator-select'); + element.append($('