CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Offset the timing of the pulsing animation

Browse Source
This commit is contained in:
Scott Lahteine 2015-02-07 10:45:56 -08:00
parent 78b9428f4e
commit 69240d41b0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/configurator/js/configurator.js
View File

@ -62,7 +62,8 @@ var configuratorApp = (function(){
therms_list = {}, therms_list = {},
total_config_lines, total_config_lines,
total_config_adv_lines, total_config_adv_lines,
hover_timer; hover_timer,
pulse_offset = 0;
// Return this anonymous object as configuratorApp // Return this anonymous object as configuratorApp
return { return {
@ -142,12 +143,13 @@ var configuratorApp = (function(){
$('#message').prepend($err); $('#message').prepend($err);
var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,'); var baseColor = $err.css('color').replace(/rgba?\(([^),]+,[^),]+,[^),]+).*/, 'rgba($1,');
var d = new Date(); var d = new Date();
err.startTime = d.getTime(); err.pulse_offset = (pulse_offset += 200);
err.startTime = d.getTime() + pulse_offset;
err.pulser = setInterval(function(){ err.pulser = setInterval(function(){
d = new Date(); d = new Date();
var pulse_time = (d.getTime() - err.startTime); var pulse_time = d.getTime() + err.pulse_offset;
$err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'}); $err.css({color:baseColor+(0.5+Math.sin(pulse_time/200)*0.4)+')'});
if (pulse_time > 5000) { if (pulse_time - err.startTime > 5000) {
clearInterval(err.pulser); clearInterval(err.pulser);
$err.remove(); $err.remove();
} }