Merge pull request #1041 from sampotts/a11y-improvements

A11y improvements

2 files changed, 1 insertions, 23 deletions

diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js
index 19e98f6f..69e4d46c 100644
--- a/src/js/utils/elements.js
+++ b/src/js/utils/elements.js
@@ -283,25 +283,3 @@ export function trapFocus(element = null, toggle = false) {
 
     toggleListener.call(this, this.elements.container, 'keydown', trap, toggle, false);
 }
-
-// Toggle aria-pressed state on a toggle button
-// http://www.ssbbartgroup.com/blog/how-not-to-misuse-aria-states-properties-and-roles
-export function toggleState(element, input) {
-    // If multiple elements passed
-    if (is.array(element) || is.nodeList(element)) {
-        Array.from(element).forEach(target => toggleState(target, input));
-        return;
-    }
-
-    // Bail if no target
-    if (!is.element(element)) {
-        return;
-    }
-
-    // Get state
-    const pressed = element.getAttribute('aria-pressed') === 'true';
-    const state = is.boolean(input) ? input : !pressed;
-
-    // Set the attribute on target
-    element.setAttribute('aria-pressed', state);
-}
diff --git a/src/js/utils/time.js b/src/js/utils/time.js
index 0c9fce64..7c9860fd 100644
--- a/src/js/utils/time.js
+++ b/src/js/utils/time.js
@@ -32,5 +32,5 @@ export function formatTime(time = 0, displayHours = false, inverted = false) {
     }
 
     // Render
-    return `${inverted ? '-' : ''}${hours}${format(mins)}:${format(secs)}`;
+    return `${inverted && time > 0 ? '-' : ''}${hours}${format(mins)}:${format(secs)}`;
 }