Wrap up the state as an upvalue in the prepare function.

[ultimatescore] / score.js

diff --git a/score.js b/score.js
index 85ab488b39d9a17f05ee9a81bcb86c787f85c3f7..3f0a4d055daad4353f9d96ceffedd3adaf9679f8 100644 (file)
--- a/score.js
+++ b/score.js
@@ -110,19 +110,6 @@ function showlowerthird()
 {
        if (lowerthird_visible) return;
 
-       // With no flexbox, this is how it has to be...
-       let f = document.getElementById('lowerthird-headline');
-       let g = document.getElementById('lowerthird-headline-content');
-       f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px';
-
-       f = document.getElementById('lowerthird-subheading');
-       g = document.getElementById('lowerthird-subheading-content');
-       f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px';
-
-       f = document.getElementById('lowerthird-picture');
-       g = document.getElementById('lowerthird-picture-content');
-       f.style.paddingTop = Math.round((f.clientHeight - g.clientHeight) / 2) + 'px';
-
        document.getElementById('lowerthird-headline').className = 'lowerthird-headline lowerthird-headline-animate-in';
        document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-in';
        document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-in';
@@ -153,7 +140,7 @@ function hidelowerthird()
        document.getElementById('lowerthird-headline-content').className = 'lowerthird-headline-content lowerthird-headline-content-animate-out';
        document.getElementById('lowerthird-subheading').className = 'lowerthird-subheading lowerthird-subheading-animate-out';
        document.getElementById('lowerthird-subheading-content').className = 'lowerthird-subheading-content lowerthird-subheading-content-animate-out';
-       document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-hidden lowerthird-picture-animate-out';
+       document.getElementById('lowerthird-picture').className = 'lowerthird-picture lowerthird-picture-animate-out';
        document.getElementById('lowerthird-picture-content').className = 'lowerthird-picture-content lowerthird-picture-content-animate-out';
        lowerthird_visible = false;
 }
@@ -177,7 +164,20 @@ function update_clock()
        let sec = elapsed % 60;
 
        if (sec < 10) sec = "0" + sec;
-       document.getElementById('clock').innerHTML = min + ":" + sec;
+       let text = min + ":" + sec;
+
+       // This is a hack around the fact that Exo has variable-width numerals.
+       // It doesn't look fantastic, but for the clock, it's better not to have
+       // the text jumping around.
+       let html = "";
+       for (let i = 0; i < text.length; ++i) {
+               if (text.charAt(i) === ':') {
+                       html += ':';
+               } else {
+                       html += "<div style='display: inline-block; width: 15px'>" + text.charAt(i) + "</div>";
+               }
+       }
+       document.getElementById('clock').innerHTML = html;
 }
 
 function goalA()
@@ -215,14 +215,11 @@ function update_score()
        document.getElementById('score').innerHTML = scoreA + "&nbsp;–&nbsp;" + scoreB;
 }
 
-/* called by caspar only */
+/* called by the Nageru theme only */
 function play()
 {
        document.getElementById('manualcontrols').style.display = 'none';
        document.getElementById('area').style.display = 'none';
-
-       // Old CEF workaround
-       document.getElementById('lowerthird-subheading').style.top = '638px';
 }
 
 function update(v)