From fc2ce55dacb0865cac052953fb7561a07a72324c Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Wed, 12 Nov 2014 16:07:21 -0800 Subject: [PATCH] Swith to pure CSS solution to blinking time --- winamp.css | 12 ++++++++---- winamp.js | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/winamp.css b/winamp.css index 2b97e177..90544ac5 100755 --- a/winamp.css +++ b/winamp.css @@ -12,10 +12,6 @@ a:focus { outline: none; } } /* Animation */ -.blink { - animation: blink 2s step-start 1s infinite; - -webkit-animation: blink 2s step-start 1s infinite; -} @keyframes blink { 0% { opacity: 1.0; } 50% { opacity: 0.0; } @@ -159,6 +155,10 @@ a:focus { outline: none; } } .stop .status #time { display:none; } +.pause .status #time { + animation: blink 2s step-start 1s infinite; + -webkit-animation: blink 2s step-start 1s infinite; +} .status #time #minus-sign { position: absolute; @@ -651,6 +651,10 @@ a:focus { outline: none; } } .stop.shade #shade-time { display:none; } +.pause.shade #shade-time { + animation: blink 2s step-start 1s infinite; + -webkit-animation: blink 2s step-start 1s infinite; +} .shade #shade-time .character { position: absolute; diff --git a/winamp.js b/winamp.js index 5c589b90..63e4a6a2 100755 --- a/winamp.js +++ b/winamp.js @@ -185,7 +185,6 @@ function Winamp () { }); this.media.addEventListener('ended', function() { - self.stopBlinkTime(); self.setStatus('stop'); }); @@ -195,7 +194,6 @@ function Winamp () { this.media.addEventListener('playing', function() { self.nodes.workIndicator.classList.remove('selected'); - self.stopBlinkTime(); }); this.nodes.shade.onclick = function() { @@ -217,7 +215,6 @@ function Winamp () { } this.nodes.play.onclick = function() { - self.stopBlinkTime(); self.media.play(); self.setStatus('play'); } @@ -225,13 +222,11 @@ function Winamp () { this.nodes.pause.onclick = function() { self.media.pause(); self.setStatus('pause'); - self.startBlinkTime(); } this.nodes.stop.onclick = function() { self.media.stop(); self.setStatus('stop'); - self.stopBlinkTime(); } this.nodes.next.onclick = function() { @@ -290,16 +285,6 @@ function Winamp () { } /* Functions */ - this.startBlinkTime = function(){ - self.nodes.time.classList.add('blink'); - self.nodes.shadeTime.classList.add('blink'); - } - this.stopBlinkTime = function(){ - self.nodes.time.classList.remove('blink'); - self.nodes.shadeTime.classList.remove('blink'); - } - - this.setStatus = function(className) { var statusOptions = ['play', 'stop', 'pause']; for(var i = 0; i < statusOptions.length; i++) {