From 5692d9b8dc18496c79ff7cb02d8340fd73d6f615 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Thu, 12 Dec 2019 12:58:44 -0300 Subject: [PATCH] =?UTF-8?q?HOT-FIX:=20corrige=20resolu=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20conflito=20de=20merge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/templates/painel/index.html | 41 -------------------------------- 1 file changed, 41 deletions(-) diff --git a/sapl/templates/painel/index.html b/sapl/templates/painel/index.html index e9f8d53f7..5f04ac359 100644 --- a/sapl/templates/painel/index.html +++ b/sapl/templates/painel/index.html @@ -168,47 +168,6 @@ } return voto } - - var audioAlertFinish = document.getElementById("audio"); - - $('#cronometro_discurso').runner({ - autostart: false, - countdown: true, - startAt: {{ 'discurso'|cronometro_to_seconds }} * 1000, - stopAt: 0, - milliseconds: false, - format: function(value) { - let h = Math.floor((value/1000) / 3600); - h = checkTime(h); - let m = Math.floor((value/1000) % 3600 / 60); - m = checkTime(m); - let s = Math.floor((value/1000) % 3600 % 60); - s = checkTime(s); - return h.toString() + ":" + m.toString() + ":" + s.toString(); - } - }).on('runnerFinish', function(eventObject, info){ - audioAlertFinish.play(); - }); - - $('#cronometro_aparte').runner({ - autostart: false, - countdown: true, - startAt: {{ 'aparte'|cronometro_to_seconds }} * 1000, - stopAt: 0, - milliseconds: false, - format: function(value) { - let h = Math.floor((value/1000) / 3600); - h = checkTime(h); - let m = Math.floor((value/1000) % 3600 / 60); - m = checkTime(m); - let s = Math.floor((value/1000) % 3600 % 60); - s = checkTime(s); - return h.toString() + ":" + m.toString() + ":" + s.toString(); - } - }).on('runnerFinish', function(eventObject, info){ - audioAlertFinish.play(); - }); - function playAudioNumVezes(audio, times, ended) { if (times <= 0) { return;