Mercurial > hg > digilib
changeset 1633:ee3417196bc8 release-2.5
Merge from HEAD
5c81d249ccd0185abd5c6871a39f60ea838152a1
| author | robcast |
|---|---|
| date | Fri, 02 Jun 2017 12:42:50 +0200 |
| parents | 373af7570bb7 (diff) 5c81d249ccd0 (current diff) |
| children | ba6e93840f38 |
| files | common/src/main/java/digilib/conf/DigilibConfiguration.java webapp/src/main/webapp/jquery/jquery.digilib.js |
| diffstat | 17 files changed, 35 insertions(+), 265 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 02 12:41:24 2017 +0200 +++ b/.hgtags Fri Jun 02 12:42:50 2017 +0200 @@ -7,3 +7,4 @@ 47006645dc1270ba275253fddca5aa5c44e69ba1 Root_digilibPDF a336f89a9fbf0a79f964d9750b56d4e6f83bb4c8 release_1_2 16c847c3291cd5e7ddba329c6dbac64148d772f7 Root_gen2_1 +87e26192f7fab0ac5e791e1ae59b39e0b974cef3 release-2.5.1
--- a/common-bioformats/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/common-bioformats/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -3,7 +3,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> <relativePath>..</relativePath> </parent> <artifactId>digilib-common-bioformats</artifactId>
--- a/common-imagej/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/common-imagej/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -3,7 +3,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> <relativePath>..</relativePath> </parent> <artifactId>digilib-common-imagej</artifactId>
--- a/common-jai/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/common-jai/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -3,7 +3,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> <relativePath>..</relativePath> </parent> <artifactId>digilib-common-jai</artifactId>
--- a/common/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/common/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -6,7 +6,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-common</artifactId>
--- a/common/src/main/java/digilib/conf/DigilibConfiguration.java Fri Jun 02 12:41:24 2017 +0200 +++ b/common/src/main/java/digilib/conf/DigilibConfiguration.java Fri Jun 02 12:42:50 2017 +0200 @@ -57,7 +57,7 @@ /** digilib version */ public static String getClassVersion() { - return "2.5.3a"; + return "2.5.3"; } /* non-static getVersion for Java inheritance */
--- a/doc/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/doc/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -3,7 +3,7 @@ <parent> <groupId>digilib</groupId> <artifactId>digilib</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-doc</artifactId> <packaging>pom</packaging>
--- a/iiif-presentation/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/iiif-presentation/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -6,7 +6,7 @@ <parent> <groupId>digilib</groupId> <artifactId>digilib</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-iiif-presentation</artifactId> <name>digilib-iiif-presentation</name>
--- a/pdf/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/pdf/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -4,7 +4,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-pdf</artifactId> <name>digilib-pdf</name>
--- a/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -8,7 +8,7 @@ <groupId>digilib</groupId> <artifactId>digilib</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> <packaging>pom</packaging> <name>digilib</name> @@ -201,62 +201,62 @@ <dependency> <groupId>digilib</groupId> <artifactId>digilib-common</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-common-jai</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-common-imagej</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-common-bioformats</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-doc</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-pdf</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-text</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-iiif-presentation</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-servlet</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-servlet2</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-servlet3</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>digilib</groupId> <artifactId>digilib-webapp</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </dependency> </dependencies> </dependencyManagement>
--- a/servlet/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/servlet/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -5,7 +5,7 @@ <parent> <groupId>digilib</groupId> <artifactId>digilib</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-servlet</artifactId> <name>digilib-servlet</name>
--- a/servlet2/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/servlet2/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -5,7 +5,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-servlet2</artifactId> <name>digilib-servlet2</name>
--- a/servlet3/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/servlet3/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -3,7 +3,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-servlet3</artifactId> <name>digilib-servlet3</name>
--- a/text/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/text/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -4,7 +4,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-text</artifactId> <name>digilib-text</name>
--- a/webapp/pom.xml Fri Jun 02 12:41:24 2017 +0200 +++ b/webapp/pom.xml Fri Jun 02 12:42:50 2017 +0200 @@ -6,7 +6,7 @@ <parent> <artifactId>digilib</artifactId> <groupId>digilib</groupId> - <version>2.5-SNAPSHOT</version> + <version>2.5.3</version> </parent> <artifactId>digilib-webapp</artifactId> <name>digilib-webapp</name>
--- a/webapp/pom.xml.orig Fri Jun 02 12:41:24 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,204 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>digilib</artifactId> - <groupId>digilib</groupId> - <version>2.3.7</version> - </parent> - <artifactId>digilib-webapp</artifactId> - <name>digilib-webapp</name> - <description>The Digital Image Library - web application server and HTML and JS clients.</description> - <url>http://digilib.sourceforge.net</url> - <packaging>war</packaging> - - <properties> - <skipTests>true</skipTests> - </properties> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>1.4</version> - <configuration> - <includes> - <include>**/*digilib*.js</include> - <include>**/*.jsp</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19</version> - <configuration> - <skip>${skipTests}</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <profiles> - <profile> - <id>servlet2</id> - <activation> - <property> - <name>servletapi</name> - <value>2</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-servlet2</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webXml>${basedir}/src/main/webapp/WEB-INF/web-2.4.xml</webXml> - <classifier>srv2</classifier> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>servlet3</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>servletapi</name> - <value>3</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-servlet3</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webXml>${basedir}/src/main/webapp/WEB-INF/web-3.0.xml</webXml> - <classifier>srv3</classifier> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>pdf</id> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-pdf</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>text</id> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-text</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>codec-jai</id> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-jai</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>codec-imagej</id> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-imagej</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>codec-bioformats</id> - <dependencies> - <dependency> - <groupId>digilib</groupId> - <artifactId>digilib-common-bioformats</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>cors-filter</id> - <!-- external servlet filter to add CORS headers. enable in web.xml --> - <dependencies> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>9.2.13.v20150730</version> - </dependency> - </dependencies> - </profile> - </profiles> - <dependencies> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>9.2.13.v20150730</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>9.2.13.v20150730</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - </dependencies> -</project>
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js Fri Jun 02 12:41:24 2017 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Fri Jun 02 12:42:50 2017 +0200 @@ -45,7 +45,7 @@ var defaults = { // version of this script - 'version' : 'jquery.digilib.js 2.5.3a', + 'version' : 'jquery.digilib.js 2.5.3', // logo url 'logoUrl' : 'img/digilib-logo-text1.png', // homepage url (behind logo) @@ -245,12 +245,9 @@ elemSettings.scalerBaseUrl = elemSettings.digilibBaseUrl + '/servlet/Scaler'; } } - /* - * set up event handlers - */ + // set up event handlers $(data).on('update', handleUpdate); // handleUpdate needs to be the first handler for update $(data).on('changeZoomArea', handleChangeZoomArea); - $(data).on('newpage', handleNewpage); // initialise plugins for (n in plugins) { var p = plugins[n]; @@ -306,8 +303,7 @@ var cssPrefix = settings.cssPrefix; var aboutSelector = '#'+cssPrefix+'about'; if (isOnScreen(data, aboutSelector)) { - // fade out and kill, so we can re-render with new info - $(aboutSelector).fadeOut(function () {$(this).remove()}); + $(aboutSelector).fadeToggle(); return; } // make relative logoUrl absolute @@ -315,15 +311,6 @@ if (logoUrl.charAt(0) !== '/' && logoUrl.substring(0,3) !== 'http') { logoUrl = settings.digilibBaseUrl + '/' + logoUrl; } - // add image info if available - var imgInfoDiv = ''; - if (data.imgInfo != null) { - var info = data.imgInfo; - imgInfoDiv = '<p>Image: ' + info.filename + '<br/>' - + '(' + info.width + 'x' + info.height + 'px' - + ((info.dpi_x > 0) ? (', ' + info.dpi_x + 'dpi') : '') - + ')</p>'; - } var html = '\ <div id="'+cssPrefix+'about" class="'+cssPrefix+'about" style="display:none">\ <p>Digilib Image Viewer</p>\ @@ -331,7 +318,6 @@ <img class="'+settings.cssPrefix+'logo" title="Digilib" src="'+logoUrl+'"/>\ </a>\ <p>Version: '+settings.version+'</p>\ - '+imgInfoDiv+'\ </div>'; var $about = $(html); $about.appendTo($elem); @@ -391,8 +377,9 @@ return false; } } - // send newpage event (plugins can remove marks etc.) - $(data).trigger('newpage'); + // reset mk and others(?) + data.marks = []; + data.zoomArea = FULL_AREA.copy(); // then reload redisplay(data); }, @@ -1349,27 +1336,13 @@ }; }; - /** - * handle image load error event - */ var handleScalerImgError = function (data, evt, a, b) { console.error("error loading scaler image:", evt); - // trigger event for plugins $(data).trigger('imgerror'); }; - - /** - * handle newpage event - */ - var handleNewpage = function (data) { - console.debug("handle newpage"); - // reset local page settings - data.imgInfo = null; - data.zoomArea = FULL_AREA.copy(); - }; - /** - * handle imageInfo loaded event + /** handle imageInfo loaded event + * */ var handleImageInfo = function (evt, json) { console.debug("handleImageInfo:", json);