grunt fixes

Author: zimeon

.gitignore

@@ -4,3 +4,4 @@ scripts/factory.py
 scripts/factory.pyc
 .ruby-version
 package-lock.json
+.DS_Store

.travis.yml

@@ -1,4 +1,5 @@
 sudo: false
+
 env:
   global:
     - ROOT_BRANCHES="master prezi3"
@@ -10,16 +11,21 @@ install:
   - bundle install
   - npm install grunt grunt-html --save-dev
 
+# randomly having java opts set breaks grunt-html
+before_script:
+  - unset _JAVA_OPTIONS
+
+  # looks like grunt-html use the W3C validator at: https://github.com/validator/validator
 script:
   - rake ci
 
 # environment
 language: ruby
 rvm:
-  - "2.2.3"
+  - "2.4.1"
 jdk:
   - oraclejdk8
-dist: precise
+dist: trusty
 
 before_deploy: if [[ ${ROOT_BRANCHES} =~ .*${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}.* ]]; then
     echo "Building at root ${ROOT_INSTALL}";

Gruntfile.js

@@ -8,7 +8,8 @@ module.exports = function(grunt) {
             /cc:attributionURL/,
             /Attribute “rel” not allowed on element “span”/,
             /Consider using the “h1” element/,
-				/Attribute “integrity” not allowed on element “script”/
+            /Attribute “integrity” not allowed on element “script”/,
+            /This document appears to be written in French but the/
           ]
         },
         src : '_site/**/*.html'

package.json

@@ -5,7 +5,7 @@
   "dependencies": {},
   "devDependencies": {
     "grunt": "~0.4.5",
-    "grunt-html": "~3.0.0"
+    "grunt-html": "^9.0.0"
   },
   "scripts": {
     "test": "grunt test"

source/api/image/validator/index.html

@@ -9,9 +9,9 @@
 
 		<link property="" href="{{ site.url }}{{ site.baseurl }}/api/image/validator/css/cupertino/jquery-ui-1.8.17.custom.css" type="text/css" rel="stylesheet">
 		<link property="" href="{{ site.url }}{{ site.baseurl }}/api/image/validator/css/iiif.css" type="text/css" rel="stylesheet">
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-1.11.1.min.js"></script>
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-ui-1.8.17.custom.min.js"></script>
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/api/image/validator/js/select.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-1.11.1.min.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-ui-1.8.17.custom.min.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/api/image/validator/js/select.js"></script>
 
 <section class="wrapper">
 	<form method="get" action="results/">

source/api/image/validator/results.html

@@ -11,9 +11,9 @@
 
 		<link property="" href="{{ site.url }}{{ site.baseurl }}/api/image/validator/css/cupertino/jquery-ui-1.8.17.custom.css" type="text/css" rel="stylesheet"/>
 		<link property="" href="{{ site.url }}{{ site.baseurl }}/api/image/validator/css/iiif.css" type="text/css" rel="stylesheet"/>
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-1.11.1.min.js"></script>
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-ui-1.8.17.custom.min.js"></script>
-		<script type="text/javascript" src="{{ site.url }}{{ site.baseurl }}/api/image/validator/js/results.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-1.11.1.min.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/js/vendor/jquery-ui-1.8.17.custom.min.js"></script>
+		<script src="{{ site.url }}{{ site.baseurl }}/api/image/validator/js/results.js"></script>
 
 
 

source/api/presentation/validator/service/index.html

@@ -53,8 +53,8 @@ <h3>Validation Results:</h3>
 </ul>
 </div>
     <!-- AJAX code for form submission -->
-    <script type="text/javascript">
-      
+    <script>
+
       // Call out to the validation service and get a result
       function handleSubmission(e) {
         e.preventDefault();
@@ -92,6 +92,6 @@ <h3>Validation Results:</h3>
       // Set up event handler.
       $('#submit-url').on("click", handleSubmission);
     </script>
- 
+
 
 </section>