Merge branch 'master' into multiple-graders-redo

Author: Victor Nazzaro

.travis.yml

@@ -1,4 +1,10 @@
 language: node_js
+dist: trusty
+sudo: true
+node_js:
+  - '8'
+  - '9'
+  - '10'
 addons:
   firefox: latest
 before_script:

dist/pdf-annotate.js

@@ -78,7 +78,7 @@ export default {
    * @param {String} pageNumber The page number
    * @return {Promise}
    */
-  getAnnotations(documentId, pageNumber) {
+  getAnnotations(documentId, userId, pageNumber) {
     return this.getStoreAdapter().getAnnotations(...arguments);
   },
 

src/PDFJSAnnotate.js

@@ -33,11 +33,11 @@ function handleDocumentMousedown(e) {
   }
 
   let svg = findSVGContainer(target);
-  let { documentId } = getMetadata(svg);
+  let { documentId, userId } = getMetadata(svg);
   let annotationId = target.getAttribute('data-pdf-annotate-id');
 
   let event = e;
-  PDFJSAnnotate.getStoreAdapter().getAnnotation(documentId, annotationId).then((annotation) => {
+  PDFJSAnnotate.getStoreAdapter().getAnnotation(documentId, userId, annotationId).then((annotation) => {
     if (annotation) {
       path = null;
       lines = [];

src/UI/arrow.js

@@ -59,10 +59,10 @@ function saveCircle(svg, type, pt, radius, color) {
     r: radius
   };
 
-  let { documentId, pageNumber } = getMetadata(svg);
+  let { documentId, userId, pageNumber } = getMetadata(svg);
 
   // Add the annotation
-  PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, pageNumber, annotation)
+  PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, userId, pageNumber, annotation)
     .then((annotation) => {
       appendChild(svg, annotation);
     });

src/UI/circle.js

@@ -225,11 +225,11 @@ function handleDocumentMouseup(e) {
   let target = document.querySelectorAll(`[data-pdf-annotate-id="${annotationId}"]`);
   let type = target[0].getAttribute('data-pdf-annotate-type');
   let svg = overlay.parentNode.querySelector(config.annotationSvgQuery());
-  let { documentId } = getMetadata(svg);
+  let { documentId, userId } = getMetadata(svg);
 
   overlay.querySelector('a').style.display = '';
 
-  PDFJSAnnotate.getStoreAdapter().getAnnotation(documentId, annotationId).then((annotation) => {
+  PDFJSAnnotate.getStoreAdapter().getAnnotation(documentId, userId, annotationId).then((annotation) => {
     let attribX = 'x';
     let attribY = 'y';
     if (['circle', 'fillcircle', 'emptycircle'].indexOf(type) > -1) {

src/UI/edit.js

@@ -48,6 +48,7 @@ export function createPage(pageNumber) {
 export function renderPage(pageNumber, renderOptions) {
   let {
     documentId,
+    userId,
     pdfDocument,
     scale,
     rotate
@@ -56,7 +57,7 @@ export function renderPage(pageNumber, renderOptions) {
   // Load the page and annotations
   return Promise.all([
     pdfDocument.getPage(pageNumber),
-    PDFJSAnnotate.getAnnotations(documentId, pageNumber)
+    PDFJSAnnotate.getAnnotations(documentId, userId, pageNumber)
   ]).then(([pdfPage, annotations]) => {
     let page = document.getElementById(`pageContainer${pageNumber}`);
     let svg = page.querySelector(config.annotationClassQuery());

src/UI/page.js

@@ -44,9 +44,8 @@ function saveToStorage(x, y){
   _candraw = false;
   let svg;
   if (lines.length > 1 && (svg = findSVGAtPoint(x, y))) {
-    let { documentId, pageNumber } = getMetadata(svg);
-
-    PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, pageNumber, {
+    let { documentId, userId, pageNumber } = getMetadata(svg);
+    PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, userId, pageNumber, {
         type: 'drawing',
         width: _penSize,
         color: _penColor,

src/UI/pen.js

@@ -70,7 +70,7 @@ function savePoint() {
     }
 
     let rect = svg.getBoundingClientRect();
-    let { documentId, pageNumber } = getMetadata(svg);
+    let { documentId, userId, pageNumber } = getMetadata(svg);
     let annotation = Object.assign({
         type: 'point'
       }, scaleDown(svg, {
@@ -79,7 +79,7 @@ function savePoint() {
       })
     );
 
-    PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, pageNumber, annotation)
+    PDFJSAnnotate.getStoreAdapter().addAnnotation(documentId, userId, pageNumber, annotation)
       .then((annotation) => {
         PDFJSAnnotate.getStoreAdapter().addComment(
           documentId,