update annotator.js library and fix the annotator-adder button hover state in courseware.

common/static/js/vendor/annotator.store.js

+/*
+** Annotator 1.2.6-dev-dc18206
+** 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-05-16 18:02:02Z
+*/
+
+
+(function() {
+  var __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; },
+    __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.Store = (function(_super) {
+    __extends(Store, _super);
+
+    Store.prototype.events = {
+      'annotationCreated': 'annotationCreated',
+      'annotationDeleted': 'annotationDeleted',
+      'annotationUpdated': 'annotationUpdated'
+    };
+
+    Store.prototype.options = {
+      annotationData: {},
+      emulateHTTP: false,
+      loadFromSearch: false,
+      prefix: '/store',
+      urls: {
+        create: '/annotations',
+        read: '/annotations/:id',
+        update: '/annotations/:id',
+        destroy: '/annotations/:id',
+        search: '/search'
+      }
+    };
+
+    function Store(element, options) {
+      this._onError = __bind(this._onError, this);
+      this._onLoadAnnotationsFromSearch = __bind(this._onLoadAnnotationsFromSearch, this);
+      this._onLoadAnnotations = __bind(this._onLoadAnnotations, this);
+      this._getAnnotations = __bind(this._getAnnotations, this);      Store.__super__.constructor.apply(this, arguments);
+      this.annotations = [];
+    }
+
+    Store.prototype.pluginInit = function() {
+      if (!Annotator.supported()) {
+        return;
+      }
+      if (this.annotator.plugins.Auth) {
+        return this.annotator.plugins.Auth.withToken(this._getAnnotations);
+      } else {
+        return this._getAnnotations();
+      }
+    };
+
+    Store.prototype._getAnnotations = function() {
+      if (this.options.loadFromSearch) {
+        return this.loadAnnotationsFromSearch(this.options.loadFromSearch);
+      } else {
+        return this.loadAnnotations();
+      }
+    };
+
+    Store.prototype.annotationCreated = function(annotation) {
+      var _this = this;
+
+      if (__indexOf.call(this.annotations, annotation) < 0) {
+        this.registerAnnotation(annotation);
+        return this._apiRequest('create', annotation, function(data) {
+          if (data.id == null) {
+            console.warn(Annotator._t("Warning: No ID returned from server for annotation "), annotation);
+          }
+          return _this.updateAnnotation(annotation, data);
+        });
+      } else {
+        return this.updateAnnotation(annotation, {});
+      }
+    };
+
+    Store.prototype.annotationUpdated = function(annotation) {
+      var _this = this;
+
+      if (__indexOf.call(this.annotations, annotation) >= 0) {
+        return this._apiRequest('update', annotation, (function(data) {
+          return _this.updateAnnotation(annotation, data);
+        }));
+      }
+    };
+
+    Store.prototype.annotationDeleted = function(annotation) {
+      var _this = this;
+
+      if (__indexOf.call(this.annotations, annotation) >= 0) {
+        return this._apiRequest('destroy', annotation, (function() {
+          return _this.unregisterAnnotation(annotation);
+        }));
+      }
+    };
+
+    Store.prototype.registerAnnotation = function(annotation) {
+      return this.annotations.push(annotation);
+    };
+
+    Store.prototype.unregisterAnnotation = function(annotation) {
+      return this.annotations.splice(this.annotations.indexOf(annotation), 1);
+    };
+
+    Store.prototype.updateAnnotation = function(annotation, data) {
+      if (__indexOf.call(this.annotations, annotation) < 0) {
+        console.error(Annotator._t("Trying to update unregistered annotation!"));
+      } else {
+        $.extend(annotation, data);
+      }
+      return $(annotation.highlights).data('annotation', annotation);
+    };
+
+    Store.prototype.loadAnnotations = function() {
+      return this._apiRequest('read', null, this._onLoadAnnotations);
+    };
+
+    Store.prototype._onLoadAnnotations = function(data) {
+      if (data == null) {
+        data = [];
+      }
+      this.annotations = this.annotations.concat(data);
+      return this.annotator.loadAnnotations(data.slice());
+    };
+
+    Store.prototype.loadAnnotationsFromSearch = function(searchOptions) {
+      return this._apiRequest('search', searchOptions, this._onLoadAnnotationsFromSearch);
+    };
+
+    Store.prototype._onLoadAnnotationsFromSearch = function(data) {
+      if (data == null) {
+        data = {};
+      }
+      return this._onLoadAnnotations(data.rows || []);
+    };
+
+    Store.prototype.dumpAnnotations = function() {
+      var ann, _i, _len, _ref, _results;
+
+      _ref = this.annotations;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        ann = _ref[_i];
+        _results.push(JSON.parse(this._dataFor(ann)));
+      }
+      return _results;
+    };
+
+    Store.prototype._apiRequest = function(action, obj, onSuccess) {
+      var id, options, request, url;
+
+      id = obj && obj.id;
+      url = this._urlFor(action, id);
+      options = this._apiRequestOptions(action, obj, onSuccess);
+      request = $.ajax(url, options);
+      request._id = id;
+      request._action = action;
+      return request;
+    };
+
+    Store.prototype._apiRequestOptions = function(action, obj, onSuccess) {
+      var data, method, opts;
+
+      method = this._methodFor(action);
+      opts = {
+        type: method,
+        headers: this.element.data('annotator:headers'),
+        dataType: "json",
+        success: onSuccess || function() {},
+        error: this._onError
+      };
+      if (this.options.emulateHTTP && (method === 'PUT' || method === 'DELETE')) {
+        opts.headers = $.extend(opts.headers, {
+          'X-HTTP-Method-Override': method
+        });
+        opts.type = 'POST';
+      }
+      if (action === "search") {
+        opts = $.extend(opts, {
+          data: obj
+        });
+        return opts;
+      }
+      data = obj && this._dataFor(obj);
+      if (this.options.emulateJSON) {
+        opts.data = {
+          json: data
+        };
+        if (this.options.emulateHTTP) {
+          opts.data._method = method;
+        }
+        return opts;
+      }
+      opts = $.extend(opts, {
+        data: data,
+        contentType: "application/json; charset=utf-8"
+      });
+      return opts;
+    };
+
+    Store.prototype._urlFor = function(action, id) {
+      var url;
+
+      url = this.options.prefix != null ? this.options.prefix : '';
+      url += this.options.urls[action];
+      url = url.replace(/\/:id/, id != null ? '/' + id : '');
+      url = url.replace(/:id/, id != null ? id : '');
+      return url;
+    };
+
+    Store.prototype._methodFor = function(action) {
+      var table;
+
+      table = {
+        'create': 'POST',
+        'read': 'GET',
+        'update': 'PUT',
+        'destroy': 'DELETE',
+        'search': 'GET'
+      };
+      return table[action];
+    };
+
+    Store.prototype._dataFor = function(annotation) {
+      var data, highlights;
+
+      highlights = annotation.highlights;
+      delete annotation.highlights;
+      $.extend(annotation, this.options.annotationData);
+      data = JSON.stringify(annotation);
+      if (highlights) {
+        annotation.highlights = highlights;
+      }
+      return data;
+    };
+
+    Store.prototype._onError = function(xhr) {
+      var action, message;
+
+      action = xhr._action;
+      message = Annotator._t("Sorry we could not ") + action + Annotator._t(" this annotation");
+      if (xhr._action === 'search') {
+        message = Annotator._t("Sorry we could not search the store for annotations");
+      } else if (xhr._action === 'read' && !xhr._id) {
+        message = Annotator._t("Sorry we could not ") + action + Annotator._t(" the annotations from the store");
+      }
+      switch (xhr.status) {
+        case 401:
+          message = Annotator._t("Sorry you are not allowed to ") + action + Annotator._t(" this annotation");
+          break;
+        case 404:
+          message = Annotator._t("Sorry we could not connect to the annotations store");
+          break;
+        case 500:
+          message = Annotator._t("Sorry something went wrong with the annotation store");
+      }
+      Annotator.showNotification(message, Annotator.Notification.ERROR);
+      return console.error(Annotator._t("API request failed:") + (" '" + xhr.status + "'"));
+    };
+
+    return Store;
+
+  })(Annotator.Plugin);
+
+}).call(this);

common/static/js/vendor/annotator.tags.js

+/*
+** Annotator 1.2.6-dev-dc18206
+** 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-05-16 18:02:02Z
+*/
+
+
+(function() {
+  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; };
+
+  Annotator.Plugin.Tags = (function(_super) {
+    __extends(Tags, _super);
+
+    function Tags() {
+      this.setAnnotationTags = __bind(this.setAnnotationTags, this);
+      this.updateField = __bind(this.updateField, this);      _ref = Tags.__super__.constructor.apply(this, arguments);
+      return _ref;
+    }
+
+    Tags.prototype.options = {
+      parseTags: function(string) {
+        var tags;
+
+        string = $.trim(string);
+        tags = [];
+        if (string) {
+          tags = string.split(/\s+/);
+        }
+        return tags;
+      },
+      stringifyTags: function(array) {
+        return array.join(" ");
+      }
+    };
+
+    Tags.prototype.field = null;
+
+    Tags.prototype.input = null;
+
+    Tags.prototype.pluginInit = function() {
+      if (!Annotator.supported()) {
+        return;
+      }
+      this.field = this.annotator.editor.addField({
+        label: Annotator._t('Add some tags here') + '\u2026',
+        load: this.updateField,
+        submit: this.setAnnotationTags
+      });
+      this.annotator.viewer.addField({
+        load: this.updateViewer
+      });
+      if (this.annotator.plugins.Filter) {
+        this.annotator.plugins.Filter.addFilter({
+          label: Annotator._t('Tag'),
+          property: 'tags',
+          isFiltered: Annotator.Plugin.Tags.filterCallback
+        });
+      }
+      return this.input = $(this.field).find(':input');
+    };
+
+    Tags.prototype.parseTags = function(string) {
+      return this.options.parseTags(string);
+    };
+
+    Tags.prototype.stringifyTags = function(array) {
+      return this.options.stringifyTags(array);
+    };
+
+    Tags.prototype.updateField = function(field, annotation) {
+      var value;
+
+      value = '';
+      if (annotation.tags) {
+        value = this.stringifyTags(annotation.tags);
+      }
+      return this.input.val(value);
+    };
+
+    Tags.prototype.setAnnotationTags = function(field, annotation) {
+      return annotation.tags = this.parseTags(this.input.val());
+    };
+
+    Tags.prototype.updateViewer = function(field, annotation) {
+      field = $(field);
+      if (annotation.tags && $.isArray(annotation.tags) && annotation.tags.length) {
+        return field.addClass('annotator-tags').html(function() {
+          var string;
+
+          return string = $.map(annotation.tags, function(tag) {
+            return '<span class="annotator-tag">' + Annotator.$.escape(tag) + '</span>';
+          }).join(' ');
+        });
+      } else {
+        return field.remove();
+      }
+    };
+
+    return Tags;
+
+  })(Annotator.Plugin);
+
+  Annotator.Plugin.Tags.filterCallback = function(input, tags) {
+    var keyword, keywords, matches, tag, _i, _j, _len, _len1;
+
+    if (tags == null) {
+      tags = [];
+    }
+    matches = 0;
+    keywords = [];
+    if (input) {
+      keywords = input.split(/\s+/g);
+      for (_i = 0, _len = keywords.length; _i < _len; _i++) {
+        keyword = keywords[_i];
+        if (tags.length) {
+          for (_j = 0, _len1 = tags.length; _j < _len1; _j++) {
+            tag = tags[_j];
+            if (tag.indexOf(keyword) !== -1) {
+              matches += 1;
+            }
+          }
+        }
+      }
+    }
+    return matches === keywords.length;
+  };
+
+}).call(this);

common/static/js/vendor/annotator.tags.min.js

-/*
-** Annotator v1.2.6
+(function(){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};Annotator.Plugin.Tags=function(_super){__extends(Tags,_super);function Tags(){this.setAnnotationTags=__bind(this.setAnnotationTags,this);this.updateField=__bind(this.updateField,this);_ref=Tags.__super__.constructor.apply(this,arguments);return _ref}Tags.prototype.options={parseTags:function(string){var tags;string=$.trim(string);tags=[];if(string){tags=string.split(/\s+/)}return tags},stringifyTags:function(array){return array.join(" ")}};Tags.prototype.field=null;Tags.prototype.input=null;Tags.prototype.pluginInit=function(){if(!Annotator.supported()){return}this.field=this.annotator.editor.addField({label:Annotator._t("Add some tags here")+"…",load:this.updateField,submit:this.setAnnotationTags});this.annotator.viewer.addField({load:this.updateViewer});if(this.annotator.plugins.Filter){this.annotator.plugins.Filter.addFilter({label:Annotator._t("Tag"),property:"tags",isFiltered:Annotator.Plugin.Tags.filterCallback})}return this.input=$(this.field).find(":input")};Tags.prototype.parseTags=function(string){return this.options.parseTags(string)};Tags.prototype.stringifyTags=function(array){return this.options.stringifyTags(array)};Tags.prototype.updateField=function(field,annotation){var value;value="";if(annotation.tags){value=this.stringifyTags(annotation.tags)}return this.input.val(value)};Tags.prototype.setAnnotationTags=function(field,annotation){return annotation.tags=this.parseTags(this.input.val())};Tags.prototype.updateViewer=function(field,annotation){field=$(field);if(annotation.tags&&$.isArray(annotation.tags)&&annotation.tags.length){return field.addClass("annotator-tags").html(function(){var string;return string=$.map(annotation.tags,function(tag){return'<span class="annotator-tag">'+Annotator.$.escape(tag)+"</span>"}).join(" ")})}else{return field.remove()}};return Tags}(Annotator.Plugin);Annotator.Plugin.Tags.filterCallback=function(input,tags){var keyword,keywords,matches,tag,_i,_j,_len,_len1;if(tags==null){tags=[]}matches=0;keywords=[];if(input){keywords=input.split(/\s+/g);for(_i=0,_len=keywords.length;_i<_len;_i++){keyword=keywords[_i];if(tags.length){for(_j=0,_len1=tags.length;_j<_len1;_j++){tag=tags[_j];if(tag.indexOf(keyword)!==-1){matches+=1}}}}}return matches===keywords.length}}).call(this);
\ No newline at end of file
-** 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-01-21 09:43:52Z
-*/((function(){var a=function(a,b){return function(){return a.apply(b,arguments)}},b=Object.prototype.hasOwnProperty,c=function(a,c){function e(){this.constructor=a}for(var d in c)b.call(c,d)&&(a[d]=c[d]);return e.prototype=c.prototype,a.prototype=new e,a.__super__=c.prototype,a};Annotator.Plugin.Tags=function(b){function d(){this.setAnnotationTags=a(this.setAnnotationTags,this),this.updateField=a(this.updateField,this),d.__super__.constructor.apply(this,arguments)}return c(d,b),d.prototype.options={parseTags:function(a){var b;return a=$.trim(a),b=[],a&&(b=a.split(/\s+/)),b},stringifyTags:function(a){return a.join(" ")}},d.prototype.field=null,d.prototype.input=null,d.prototype.pluginInit=function(){if(!Annotator.supported())return;return this.field=this.annotator.editor.addField({label:Annotator._t("Add some tags here")+"…",load:this.updateField,submit:this.setAnnotationTags}),this.annotator.viewer.addField({load:this.updateViewer}),this.annotator.plugins.Filter&&this.annotator.plugins.Filter.addFilter({label:Annotator._t("Tag"),property:"tags",isFiltered:Annotator.Plugin.Tags.filterCallback}),this.input=$(this.field).find(":input")},d.prototype.parseTags=function(a){return this.options.parseTags(a)},d.prototype.stringifyTags=function(a){return this.options.stringifyTags(a)},d.prototype.updateField=function(a,b){var c;return c="",b.tags&&(c=this.stringifyTags(b.tags)),this.input.val(c)},d.prototype.setAnnotationTags=function(a,b){return b.tags=this.parseTags(this.input.val())},d.prototype.updateViewer=function(a,b){return a=$(a),b.tags&&$.isArray(b.tags)&&b.tags.length?a.addClass("annotator-tags").html(function(){var a;return a=$.map(b.tags,function(a){return'<span class="annotator-tag">'+Annotator.$.escape(a)+"</span>"}).join(" ")}):a.remove()},d}(Annotator.Plugin),Annotator.Plugin.Tags.filterCallback=function(a,b){var c,d,e,f,g,h,i,j;b==null&&(b=[]),e=0,d=[];if(a){d=a.split(/\s+/g);for(g=0,i=d.length;g<i;g++){c=d[g];if(b.length)for(h=0,j=b.length;h<j;h++)f=b[h],f.indexOf(c)!==-1&&(e+=1)}}return e===d.length}})).call(this);
\ No newline at end of file

lms/envs/common.py

@@ -446,7 +446,7 @@ PIPELINE_CSS = {
             'css/vendor/jquery.treeview.css',
             'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
             'css/vendor/jquery.qtip.min.css',
-            'css/vendor/annotator.min.css',
+            'css/vendor/annotator.css',
             'sass/course.css',
             'xmodule/modules.css',
         ],