Mercurial > hg > digilib

changeset 1283:32f39a7d3d41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 6b49c6af978fefe33b0a6c4b90435f4aa751b283
author robcast
date Thu, 06 Mar 2014 12:15:29 +0100
parents 3ffdeb8e209b (diff) 6b49c6af978f (current diff)
children 39cdaa1ee33b
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/image/ImageJobDescription.java	Mon Feb 24 07:21:25 2014 -0800
+++ b/common/src/main/java/digilib/image/ImageJobDescription.java	Thu Mar 06 12:15:29 2014 +0100
@@ -698,7 +698,7 @@
         ImageSize ess = getExpectedSourceSize();
         // nt = no transform required
         boolean nt = isImageSendable() && (
-        // lores: send if smaller
+                // lores: send if smaller
                 (isLoresOnly() && is.isSmallerThan(ess))
                 // else send if it fits
                 || (!(isLoresOnly() || isHiresOnly()) && is.fitsIn(ess)));
--- a/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Mon Feb 24 07:21:25 2014 -0800
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Thu Mar 06 12:15:29 2014 +0100
@@ -28,8 +28,8 @@
  * 
  * Shapes are objects with "geometry" and "properties" members.
  * geometry is an object with "type" and "coordinates" members.
- * Currently supported types: "Line", "Rectangle". 
- * goordinates is a list of pairs of relative coordinates.
+ * Currently supported types: "Line", "LineString", "Rectangle", "Polygon". 
+ * coordinates is a list of pairs of relative coordinates.
  * properties are the SVG properties "stroke", "stroke-width", "fill" and other properties.
  * A property 'editable':true will display drag-handles to change the shape.
  * Editing the shape will send a "changeShape"(shape) event.