Merge branch '2.3.0' into remove_jquery.data

ProjectMirador · Mar 2, 2017 · 6780561 · 6780561
2 parents 55104ec + e960a43
commit 6780561
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: node_js
+sudo: false
 node_js:
 - '5'
 before_install:
 - npm install
-# before-script:
-# - grunt test cover
 script:
 - npm run travis
diff --git a/js/src/annotations/osd-svg-overlay.js b/js/src/annotations/osd-svg-overlay.js
@@ -120,7 +120,8 @@
      */
     setMouseTool: function() {
       this.removeMouseTool();
-
+      this.paperScope.activate();
+
       this.mouseTool = new this.paperScope.Tool();
       this.mouseTool.overlay = this;
       this.mouseTool.onMouseUp = this.onMouseUp;