Merge branch 'master' of github.com:open-indy/Koa11y

doytsujin · Aug 23, 2017 · 2fb4413 · 2fb4413
2 parents 82a9059 + 52a444d
commit 2fb4413
Show file tree

Hide file tree

Showing 11 changed files with 749 additions and 729 deletions.
diff --git a/.sass-lint.yml b/.sass-lint.yml
@@ -168,6 +168,8 @@ rules:
         - outline
         - outline-offset
         - overflow
+        - overflow-x
+        - overflow-y
         - perspective
         - pointer-events
         - -webkit-transform

diff --git a/_sass/_modal.sass b/_sass/_modal.sass
@@ -16,8 +16,5 @@ $modalFadeDuration: 0.3s
 .modal-enter,
 .modal-leave-active
     opacity: 0.0
-
-.modal-enter,
-.modal-leave-active
     .modal-content
         transform: scale(1.1)
diff --git a/_scripts/_outputs/format-CSV.js b/_scripts/_outputs/format-CSV.js
@@ -1,6 +1,6 @@
 function formatCSV (imageStats, results) {
     // Ensure that the imageStats Object is not empty
-    if (!(Object.keys(imageStats).length === 0 && imageStats.constructor === Object)) {
+    if (!(Object.keys(imageStats).length === 0)) {
         // TODO: I don't know how to structure the data for CSV so that it can also contain ImgAlts data
         console.log(window.imageStats); // eslint-disable-line no-console
     }

diff --git a/_scripts/_outputs/format-HTML.js b/_scripts/_outputs/format-HTML.js
@@ -1,10 +1,13 @@
+/* eslint-disable no-multi-spaces */
+
 var fs = require('fs-extra');
 
 function formatHTML (imageStats, results, url, buttons) {
     var returnedErrors = '';
     var returnedWarnings = '';
     var returnedNotices = '';
     var panelColor = '';
+
     for (var i = 0; i < results.length; i++) {
         var resultsType = results[i].type;
         if (resultsType == 'warning') {
@@ -40,13 +43,12 @@ function formatHTML (imageStats, results, url, buttons) {
 
     var template = fs.readFileSync('_markup/template.html', 'utf8');
 
-    console.log(template);
-    var results = returnedErrors + returnedWarnings + returnedNotices;
+    results = returnedErrors + returnedWarnings + returnedNotices;
 
     var imgAlts = '';
 
     // Ensure that the imageStats Object is not empty
-    if (!(Object.keys(imageStats).length === 0 && imageStats.constructor === Object)) {
+    if (!(Object.keys(imageStats).length === 0)) {
         var totalImages = imageStats.totalImages;
         var descriptive = imageStats.descriptive;
         var descriptivePercent = imageStats.descriptivePercent;

diff --git a/_scripts/_outputs/format-JSON.js b/_scripts/_outputs/format-JSON.js
@@ -1,7 +1,7 @@
 function formatJSON (imageStats, results) {
     var outputJSON = {};
     // Ensure that the imageStats Object is not empty
-    if (!(Object.keys(imageStats).length === 0 && imageStats.constructor === Object)) {
+    if (!(Object.keys(imageStats).length === 0)) {
         outputJSON.images = imageStats;
     }
     outputJSON.results = results;

diff --git a/_scripts/_outputs/format-MD.js b/_scripts/_outputs/format-MD.js
@@ -2,7 +2,7 @@ function formatMD (imageStats, results, urlValue) {
 
     var output = '# ' + urlValue + '\n\n';
     // Ensure that the imageStats Object is not empty
-    if (!(Object.keys(imageStats).length === 0 && imageStats.constructor === Object)){
+    if (!(Object.keys(imageStats).length === 0)){
         output = output + '## Image Accessibility\n\n';
         output = output + '**Total Images:** ' + imageStats.totalImages + '  \n';
         output = output + '**Descriptive Alt Text:** ' + imageStats.descriptive + '  \n';

diff --git a/_scripts/_outputs/format-XML.js b/_scripts/_outputs/format-XML.js
@@ -3,7 +3,7 @@ function formatXML (imageStats, results) {
 
     var imgAlts = '';
     // Ensure that the imageStats Object is not empty
-    if (!(Object.keys(imageStats).length === 0 && imageStats.constructor === Object)) {
+    if (!(Object.keys(imageStats).length === 0)) {
         imgAlts =
             '  <imagealts>\n' +
             '    <totalimages>' + imageStats.totalImages + '</totalimages>\n' +