Update Annotator

... to b8c75146 (typed-packaging branch)

Fixes the shortlink problem with the Document plugin for #1760.

(Also brings in some dead code removal)

h/static/scripts/vendor/annotator.document.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-9e0eff3
+** Annotator 1.2.6-dev-b8c7514
 ** 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-09-25 22:40:55Z
+** Built at: 2014-12-15 12:18:02Z
 */
 
 
@@ -21,7 +21,8 @@
   var _ref,
     __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   Annotator.Plugin.Document = (function(_super) {
     var $;
@@ -176,7 +177,7 @@
     };
 
     Document.prototype._getLinks = function() {
-      var doi, href, id, l, link, name, rel, type, url, values, _i, _j, _k, _len, _len1, _len2, _ref1, _ref2, _ref3, _results;
+      var doi, dropTypes, href, id, l, link, name, rel, relTypes, type, url, values, _i, _j, _k, _len, _len1, _len2, _ref1, _ref2, _ref3, _results;
       this.metadata.link = [
         {
           href: document.location.href
@@ -189,7 +190,9 @@
         href = this._absoluteUrl(l.prop('href'));
         rel = l.prop('rel');
         type = l.prop('type');
-        if ((rel === "alternate" || rel === "canonical" || rel === "bookmark") && (type !== "application/rss+xml" && type !== "application/atom+xml")) {
+        relTypes = ["alternate", "canonical", "bookmark", "shortlink"];
+        dropTypes = ["application/rss+xml", "application/atom+xml"];
+        if (__indexOf.call(relTypes, rel) >= 0 && __indexOf.call(dropTypes, type) < 0) {
           this.metadata.link.push({
             href: href,
             rel: rel,

h/static/scripts/vendor/annotator.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-6623b2c
+** Annotator 1.2.6-dev-b8c7514
 ** 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-12-11 01:33:32Z
+** Built at: 2014-12-15 12:17:59Z
 */
 
 
@@ -930,13 +930,6 @@
       throw "Operation not implemented.";
     };
 
-    Highlight.prototype.setActive = function(value, batch) {
-      if (batch == null) {
-        batch = false;
-      }
-      throw "Operation not implemented.";
-    };
-
     Highlight.prototype.setFocused = function(value, batch) {
       if (batch == null) {
         batch = false;

h/static/scripts/vendor/annotator.texthighlights.js

 // Generated by CoffeeScript 1.6.3
 /*
-** Annotator 1.2.6-dev-95b7a09
+** Annotator 1.2.6-dev-b8c7514
 ** 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-12-03 11:41:09Z
+** Built at: 2014-12-15 12:18:04Z
 */
 
 
@@ -113,14 +113,6 @@
       }
     };
 
-    TextHighlight.prototype.setActive = function(value) {
-      if (value) {
-        return this.$(this._highlights).addClass('annotator-hl-active');
-      } else {
-        return this.$(this._highlights).removeClass('annotator-hl-active');
-      }
-    };
-
     TextHighlight.prototype.setFocused = function(value) {
       if (value) {
         return this.$(this._highlights).addClass('annotator-hl-focused');