Merge branch 'develop'

DDMAL · Feb 8, 2016 · c11cd13 · c11cd13
2 parents 6e05f40 + f9f6a16
commit c11cd13
Show file tree

Hide file tree

Showing 110 changed files with 3,281 additions and 2,099 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,9 +8,6 @@ env:
 install:
   - npm install -g gulp
   - npm install
-  - phantomjs --version
-
-before_script: gulp develop:build
 
 script: gulp develop:test
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 Diva.js
 
-Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
+Copyright (C) 2011-2016 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build/LICENSE b/build/LICENSE
@@ -1,6 +1,6 @@
 Diva.js
 
-Copyright (C) 2011-2015 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
+Copyright (C) 2011-2016 by Wendy Liu, Evan Magoni, Andrew Horwitz, Andrew Hankinson, Laurent Pugin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build/css/diva.css b/build/css/diva.css
diff --git a/build/css/diva.css.map b/build/css/diva.css.map
diff --git a/build/css/diva.min.css b/build/css/diva.min.css
diff --git a/build/css/diva.min.css.map b/build/css/diva.min.css.map
diff --git a/build/demo/autoscroll.html b/build/demo/autoscroll.html
@@ -2,26 +2,17 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
             <script src="/js/diva.js" type="text/javascript"></script>
             <script src="/js/plugins/autoscroll.js" type="text/javascript"></script>
             <script src="/js/utils.js" type="text/javascript"></script>
-            <style>
-            body, html{
-                height:90%;
-            }
-            #diva-wrapper{
-                height:100%;
-            }
-            .diva-outer{
-                height:100%;
-            }
-            </style>
             <script type="text/javascript">
                 $(document).ready(function() {
                     $('#diva-wrapper').diva({

diff --git a/build/demo/demo.css b/build/demo/demo.css
@@ -0,0 +1,12 @@
+body {
+    font-family: 'Helvetica Neue', 'Helvetica', Arial, Verdana, sans-serif;
+    -webkit-font-smoothing: antialiased;
+}
+
+body, html {
+    height:90%;
+}
+
+#diva-wrapper, .diva-outer {
+    height: 100%;
+}
diff --git a/build/demo/highlight.html b/build/demo/highlight.html
@@ -2,8 +2,10 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->

diff --git a/build/demo/horizontal_scrolling.html b/build/demo/horizontal_scrolling.html
@@ -2,8 +2,10 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->

diff --git a/build/demo/iiif-external.html b/build/demo/iiif-external.html
@@ -2,23 +2,16 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
             <script src="/js/diva.min.js" type="text/javascript"></script>
             <style>
-            body, html{
-                height:90%;
-            }
-            #diva-wrapper{
-                height:100%;
-            }
-            .diva-outer{
-                height:100%;
-            }
             #menu {
                 margin: 0 auto;
                 font-size: 1.5em;
@@ -29,7 +22,6 @@
                     $('#diva-wrapper').diva({
                         fixedHeightGrid: true,
                         objectData: 'http://oculus-dev.harvardx.harvard.edu/manifests/drs:5981093',
-                        enableImageTitles: false,
                         enableIIIFMetadata: true
                     });
 

diff --git a/build/demo/iiif-openings.html b/build/demo/iiif-openings.html
@@ -2,24 +2,16 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
             <script src="/js/diva.min.js" type="text/javascript"></script>
-
             <style>
-            body, html{
-                height:90%;
-            }
-            #diva-wrapper{
-                height:100%;
-            }
-            .diva-outer{
-                height:100%;
-            }
             #menu {
                 margin: 0 auto;
                 font-size: 1.5em;

diff --git a/build/demo/single.html b/build/demo/single.html
@@ -2,24 +2,15 @@
     <html lang="en">
         <head>
             <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1">
             <title>Diva.js Demo Page</title>
             <link rel="stylesheet" href="/css/diva.min.css" />
+            <link rel="stylesheet" href="demo.css" />
             <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
             <![endif]-->
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
             <script src="/js/diva.min.js" type="text/javascript"></script>
-            <style>
-            body, html{
-                height:90%;
-            }
-            #diva-wrapper{
-                height:100%;
-            }
-            .diva-outer{
-                height:100%;
-            }
-            </style>
             <script type="text/javascript">
                 $(document).ready(function() {
                     $('#diva-wrapper').diva({

diff --git a/build/img/actions.png b/build/img/actions.png
diff --git a/build/img/blank.gif b/build/img/blank.gif
diff --git a/build/img/book.png b/build/img/book.png
diff --git a/build/img/close-hover.png b/build/img/close-hover.png
diff --git a/build/img/close.png b/build/img/close.png
diff --git a/build/img/closedhand.cur b/build/img/closedhand.cur
diff --git a/build/img/document.png b/build/img/document.png
diff --git a/build/img/fullscreen.png b/build/img/fullscreen.png
diff --git a/build/img/grid.png b/build/img/grid.png
diff --git a/build/img/link.png b/build/img/link.png
diff --git a/build/img/loading.gif b/build/img/loading.gif
diff --git a/build/img/minimise.png b/build/img/minimise.png
diff --git a/build/img/openhand.cur b/build/img/openhand.cur
diff --git a/build/img/plugins/annotation.png b/build/img/plugins/annotation.png
diff --git a/build/img/plugins/canvas-buttons.png b/build/img/plugins/canvas-buttons.png
diff --git a/build/img/plugins/canvas.png b/build/img/plugins/canvas.png
diff --git a/build/img/plugins/download.png b/build/img/plugins/download.png
diff --git a/build/img/plugins/play.png b/build/img/plugins/play.png
diff --git a/build/img/zoomin.png b/build/img/zoomin.png
diff --git a/build/img/zoomout.png b/build/img/zoomout.png