changeset 1465:091cd46e1f76

more minified resources.
author robcast
date Mon, 16 Nov 2015 16:00:04 +0100
parents 8821a80fd9bc
children 45173d76aad5
files webapp/pom.xml webapp/src/main/webapp/digilib.html webapp/src/main/webapp/jquery/digilib-dbg.html webapp/src/main/webapp/jquery/digilib-mpiwg.html webapp/src/main/webapp/jquery/digilib.html webapp/src/main/webapp/jquery/jquery.digilib.js
diffstat 6 files changed, 103 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/pom.xml	Fri Nov 13 21:57:26 2015 +0100
+++ b/webapp/pom.xml	Mon Nov 16 16:00:04 2015 +0100
@@ -56,6 +56,7 @@
 					<execution>
 						<id>digilib-basic-minify</id>
 						<configuration>
+						    <!-- JS files -->
 							<jsSourceDir>jquery</jsSourceDir>
 							<jsTargetDir></jsTargetDir>
 							<jsSourceFiles>
@@ -71,12 +72,54 @@
 							</jsSourceFiles>
 							<jsFinalFile>jquery.digilib-basic.js</jsFinalFile>
 							<jsEngine>YUI</jsEngine>
+							<closureCreateSourceMap>true</closureCreateSourceMap>
+							<!--  CSS files -->
+							<cssSourceDir>jquery</cssSourceDir>
+							<cssSourceFiles>
+								<cssSourceFile>jquery.digilib.css</cssSourceFile>
+								<cssSourceFile>jquery.range.css</cssSourceFile>
+							</cssSourceFiles>
+							<cssFinalFile>jquery.digilib-basic.css</cssFinalFile>
 						</configuration>
 						<goals>
 							<goal>minify</goal>
 						</goals>
 					</execution>
                     <execution>
+                        <id>digilib-ann-minify</id>
+                        <configuration>
+                            <jsSourceDir>jquery</jsSourceDir>
+                            <jsTargetDir></jsTargetDir>
+                            <jsSourceFiles>
+                                <jsSourceFile>jquery.digilib.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.geometry.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.arrows.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.buttons.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.dialogs.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.sliders.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.birdseye.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.marks.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.regions.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.vector.js</jsSourceFile>
+                                <jsSourceFile>jquery.digilib.annotator.js</jsSourceFile>
+                                <jsSourceFile>showdown.js</jsSourceFile>
+                            </jsSourceFiles>
+                            <jsFinalFile>jquery.digilib-ann.js</jsFinalFile>
+                            <jsEngine>YUI</jsEngine>
+                            <closureCreateSourceMap>true</closureCreateSourceMap>
+                            <!--  CSS files -->
+                            <cssSourceDir>jquery</cssSourceDir>
+                            <cssSourceFiles>
+                                <cssSourceFile>jquery.digilib.css</cssSourceFile>
+                                <cssSourceFile>jquery.range.css</cssSourceFile>
+                            </cssSourceFiles>
+                            <cssFinalFile>jquery.digilib-ann.css</cssFinalFile>
+                        </configuration>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                    </execution>
+                    <execution>
                         <id>cookie-range-minify</id>
                         <configuration>
                             <jsSourceDir>jquery</jsSourceDir>
--- a/webapp/src/main/webapp/digilib.html	Fri Nov 13 21:57:26 2015 +0100
+++ b/webapp/src/main/webapp/digilib.html	Mon Nov 16 16:00:04 2015 +0100
@@ -13,9 +13,8 @@
 
         <script type="text/javascript" src="jquery/jquery.min.js"></script>
         <script type="text/javascript" src="jquery/jquery.cookie-range.min.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery/jquery.range.css" />
         <script type="text/javascript" src="jquery/jquery.digilib-basic.min.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery/jquery.digilib.css" />
+        <link rel="stylesheet" type="text/css" href="jquery/jquery.digilib-basic.min.css" />
 
         <script type="text/javascript">
             $(document).ready(function(){
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webapp/src/main/webapp/jquery/digilib-dbg.html	Mon Nov 16 16:00:04 2015 +0100
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta name="viewport" content="initial-scale=1.0"/>
+        <title>Digilib jQuery: fullscreen</title>
+
+        <style type="text/css">
+            body {
+                 background: silver;
+            }
+        </style>
+
+        <script type="text/javascript" src="jquery.js"></script>
+        <script type="text/javascript" src="jquery.cookie.js"></script>
+        <script type="text/javascript" src="jquery.digilib.js"></script>
+        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
+        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
+        <script type="text/javascript" src="jquery.range.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
+        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
+        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
+        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
+        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
+        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
+        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+
+        <script type="text/javascript">
+            $(document).ready(function(){
+                var opts = {
+                    interactionMode : 'fullscreen',
+                    showRegionNumbers : true
+                    };
+                var $div = $('div#digilib');
+                $div.digilib(opts);
+            });
+
+        </script>
+    </head>
+
+    <body>
+        <div id="digilib">
+            <p>digilib doesn't work! Please switch on Javascript or notify the server administrator!</p>
+            <img src="http://digilib.sourceforge.net/images/digilib-logo-big.png" />
+        </div>
+    </body>
+</html>
+
--- a/webapp/src/main/webapp/jquery/digilib-mpiwg.html	Fri Nov 13 21:57:26 2015 +0100
+++ b/webapp/src/main/webapp/jquery/digilib-mpiwg.html	Mon Nov 16 16:00:04 2015 +0100
@@ -11,26 +11,12 @@
             }
         </style>
 
-        <script type="text/javascript" src="json2.js"></script>
-        <script type="text/javascript" src="jquery.js"></script>
-        <script type="text/javascript" src="jquery.cookie.js"></script>
-        <script type="text/javascript" src="jquery.digilib.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
-        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
-        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
-        <script type="text/javascript" src="jquery.range.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
-        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
-        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
-        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
-        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
-        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
-        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
-        <script type="text/javascript" src="jquery.digilib.vector.js"></script>
-        <script type="text/javascript" src="showdown.js"></script>
-        <script type="text/javascript" src="annotator-dl.js"></script>
+        <script type="text/javascript" src="jquery.min.js"></script>
+        <script type="text/javascript" src="jquery.cookie-range.min.js"></script>
+        <script type="text/javascript" src="annotator-dl.min.js"></script>
+        <script type="text/javascript" src="jquery.digilib-ann.min.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib-ann.min.css" />
         <link rel="stylesheet" type="text/css" href="annotator.min.css" />
-        <script type="text/javascript" src="jquery.digilib.annotator.js"></script>
 
         <script type="text/javascript">
             $(document).ready(function(){
--- a/webapp/src/main/webapp/jquery/digilib.html	Fri Nov 13 21:57:26 2015 +0100
+++ b/webapp/src/main/webapp/jquery/digilib.html	Mon Nov 16 16:00:04 2015 +0100
@@ -11,20 +11,10 @@
             }
         </style>
 
-        <script type="text/javascript" src="jquery.js"></script>
-        <script type="text/javascript" src="jquery.cookie.js"></script>
-        <script type="text/javascript" src="jquery.digilib.js"></script>
-        <script type="text/javascript" src="jquery.digilib.geometry.js"></script>
-        <script type="text/javascript" src="jquery.digilib.arrows.js"></script>
-        <script type="text/javascript" src="jquery.range.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.range.css" />
-        <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
-        <script type="text/javascript" src="jquery.digilib.dialogs.js"></script>
-        <script type="text/javascript" src="jquery.digilib.sliders.js"></script>
-        <script type="text/javascript" src="jquery.digilib.birdseye.js"></script>
-        <script type="text/javascript" src="jquery.digilib.marks.js"></script>
-        <script type="text/javascript" src="jquery.digilib.regions.js"></script>
-        <link rel="stylesheet" type="text/css" href="jquery.digilib.css" />
+        <script type="text/javascript" src="jquery.min.js"></script>
+        <script type="text/javascript" src="jquery.cookie-range.min.js"></script>
+        <script type="text/javascript" src="jquery.digilib-basic.min.js"></script>
+        <link rel="stylesheet" type="text/css" href="jquery.digilib-basic.min.css" />
 
         <script type="text/javascript">
             $(document).ready(function(){
--- a/webapp/src/main/webapp/jquery/jquery.digilib.js	Fri Nov 13 21:57:26 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.js	Mon Nov 16 16:00:04 2015 +0100
@@ -45,7 +45,7 @@
 
     var defaults = {
         // version of this script
-        'version' : 'jquery.digilib.js 2.3.7a',
+        'version' : 'jquery.digilib.js 2.3.7b',
         // logo url
         'logoUrl' : 'img/digilib-logo-text1.png',
         // homepage url (behind logo)