Commit 0c3a527d authored by Kristof Csillag's avatar Kristof Csillag

Updated to latest version of Annotator, which fixes #425.

parent 86a84ee4
/* /*
** Annotator 1.2.6-dev-e661e78 ** Annotator 1.2.6-dev-8daf38c
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning. ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
** 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: 2013-05-09 08:46:55Z ** Built at: 2013-05-17 21:32:30Z
*/ */
......
/* /*
** Annotator 1.2.6-dev-e661e78 ** Annotator 1.2.6-dev-6014b60
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning. ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
** 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: 2013-05-09 08:46:53Z ** Built at: 2013-05-17 21:40:10Z
*/ */
...@@ -1444,8 +1444,8 @@ ...@@ -1444,8 +1444,8 @@
Annotator.prototype.checkForStartSelection = function(event) { Annotator.prototype.checkForStartSelection = function(event) {
if (!(event && this.isAnnotator(event.target))) { if (!(event && this.isAnnotator(event.target))) {
this.startViewerHideTimer(); this.startViewerHideTimer();
return this.mouseIsDown = true;
} }
return this.mouseIsDown = true;
}; };
Annotator.prototype.checkForEndSelection = function(event) { Annotator.prototype.checkForEndSelection = function(event) {
...@@ -1471,7 +1471,7 @@ ...@@ -1471,7 +1471,7 @@
range = (Range.sniff(selector)).normalize(this.wrapper[0]); range = (Range.sniff(selector)).normalize(this.wrapper[0]);
container = range.commonAncestor; container = range.commonAncestor;
if ($(container).hasClass('annotator-hl')) { if ($(container).hasClass('annotator-hl')) {
container = $(container).parents('[class^=annotator-hl]')[0]; container = $(container).parents(':not([class^=annotator-hl])')[0];
} }
if (this.isAnnotator(container)) { if (this.isAnnotator(container)) {
return; return;
......
/* /*
** Annotator 1.2.6-dev-e661e78 ** Annotator 1.2.6-dev-8daf38c
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning. ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
** 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: 2013-05-09 08:46:57Z ** Built at: 2013-05-17 21:32:32Z
*/ */
......
/* /*
** Annotator 1.2.6-dev-e661e78 ** Annotator 1.2.6-dev-8daf38c
** https://github.com/okfn/annotator/ ** https://github.com/okfn/annotator/
** **
** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning. ** Copyright 2012 Aron Carroll, Rufus Pollock, and Nick Stenning.
** 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: 2013-05-09 08:46:57Z ** Built at: 2013-05-17 21:32:33Z
*/ */
......
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