From ef100f89f1913c80043c59c6f3e9602f810b02f6 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 26 Apr 2013 17:54:37 -0400 Subject: [PATCH] CC-2301 : not drawing fades of length zero. --- .../js/waveformplaylist/track_render.js | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/airtime_mvc/public/js/waveformplaylist/track_render.js b/airtime_mvc/public/js/waveformplaylist/track_render.js index 70736dab2..54c87945b 100644 --- a/airtime_mvc/public/js/waveformplaylist/track_render.js +++ b/airtime_mvc/public/js/waveformplaylist/track_render.js @@ -395,26 +395,30 @@ WaveformDrawer.prototype.drawFade = function(id, type, shape, start, end) { ctx, tmpCtx; - width = ~~(end - start + 1); - left = start; + if ((end - start) === 0) { + return; + } - div = document.createElement("div"); - div.classList.add("playlist-fade"); - div.classList.add("playlist-fade-"+id); - div.style.width = width+"px"; - div.style.height = this.height+"px"; - div.style.top = 0; - div.style.left = left+"px"; + width = ~~(end - start + 1); + left = start; - canv = document.createElement("canvas"); - canv.setAttribute('width', width); - canv.setAttribute('height', this.height); - ctx = canv.getContext('2d'); + div = document.createElement("div"); + div.classList.add("playlist-fade"); + div.classList.add("playlist-fade-"+id); + div.style.width = width+"px"; + div.style.height = this.height+"px"; + div.style.top = 0; + div.style.left = left+"px"; - this.drawFadeCurve(ctx, shape, type, width); + canv = document.createElement("canvas"); + canv.setAttribute('width', width); + canv.setAttribute('height', this.height); + ctx = canv.getContext('2d'); - div.appendChild(canv); - fragment.appendChild(div); + this.drawFadeCurve(ctx, shape, type, width); + + div.appendChild(canv); + fragment.appendChild(div); for (i = 0, len = this.channels.length; i < len; i++) { dup = fragment.cloneNode(true);