Commit b2489932 authored by Randall Leeds's avatar Randall Leeds

Update annotator dependency

Includes backport of openannotation/annotator#200 fix. Lines removed
from flash.coffee as they are now obsolete.
parent fe44db91
......@@ -23,9 +23,6 @@ class FlashProvider
if annotator.isOpen() or not annotator.host
notice = Annotator.showNotification msg, q
@timeout = this._wait =>
# work around Annotator.Notification not removing classes
for _, klass of notice.options.classes
notice.element.removeClass klass
this._process()
else
annotator.host.notify
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-5352913
** Annotator 1.2.6-dev-1ea4888
** 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-12-16 13:46:44Z
** Built at: 2014-05-05 22:41:17Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-816c71f
** Annotator 1.2.6-dev-1ea4888
** 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-04-01 01:07:49Z
** Built at: 2014-05-05 22:41:18Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-f8e68b2
** Annotator 1.2.6-dev-1ea4888
** 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-11-30 02:02:25Z
** Built at: 2014-05-05 22:41:22Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:47:35Z
** Built at: 2014-05-05 22:41:25Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:36:40Z
** Built at: 2014-05-05 22:41:15Z
*/
......@@ -2330,13 +2330,17 @@
if (status == null) {
status = Annotator.Notification.INFO;
}
$(this.element).addClass(this.options.classes.show).addClass(this.options.classes[status]).html(Util.escape(message || ""));
this.currentStatus = status;
$(this.element).addClass(this.options.classes.show).addClass(this.options.classes[this.currentStatus]).html(Util.escape(message || ""));
setTimeout(this.hide, 5000);
return this;
};
Notification.prototype.hide = function() {
$(this.element).removeClass(this.options.classes.show);
if (this.currentStatus == null) {
this.currentStatus = Annotator.Notification.INFO;
}
$(this.element).removeClass(this.options.classes.show).removeClass(this.options.classes[this.currentStatus]);
return this;
};
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-3cbddbb
** Annotator 1.2.6-dev-1ea4888
** 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-02-17 13:39:53Z
** Built at: 2014-05-05 22:41:25Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-5352913
** Annotator 1.2.6-dev-1ea4888
** 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-12-16 13:46:48Z
** Built at: 2014-05-05 22:41:20Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-7017d90
** Annotator 1.2.6-dev-1ea4888
** 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-01-11 13:34:18Z
** Built at: 2014-05-05 22:41:21Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:36:51Z
** Built at: 2014-05-05 22:41:23Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-816c71f
** Annotator 1.2.6-dev-1ea4888
** 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-04-01 08:47:02Z
** Built at: 2014-05-05 22:41:22Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:36:53Z
** Built at: 2014-05-05 22:41:24Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:36:54Z
** Built at: 2014-05-05 22:41:24Z
*/
......
// Generated by CoffeeScript 1.6.3
/*
** Annotator 1.2.6-dev-af15c86
** Annotator 1.2.6-dev-1ea4888
** 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-04-14 22:36:52Z
** Built at: 2014-05-05 22:41:23Z
*/
......
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