Skip to content

Commit

Permalink
Merge pull request #59 from brian-brazil/lag
Browse files Browse the repository at this point in the history 
Fix lag and persist penalties
  • Loading branch information
@jaredquinn
jaredquinn authored Jun 6, 2018
2 parents 20638c6 + d42e73e commit 13734f0
Show file tree
Hide file tree
Showing 23 changed files with 310 additions and 183 deletions.
12 changes: 6 additions & 6 deletions html/controls/pt/index.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions html/controls/pt/ptcolor.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions html/views/overlays/ddtv/admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ function initialize() {
});
});

var skaterRegEx = /^Game\.Team\((.+)\)\.Skater\((.+?)\)\.(.+)$/;
WS.Register('Game.Team', function(k,v) {
var skaterRegEx = /^ScoreBoard\.Team\((.+)\)\.Skater\((.+?)\)\.(.+)$/;
WS.Register('ScoreBoard.Team', function(k,v) {
var m = k.match(skaterRegEx);
if(m) {
var key = m[3];
Expand Down Expand Up @@ -119,8 +119,8 @@ $('select#Skaters').change(function(e) {
v = $t.val();
team = $( 'option[value=' + v + ']', $t ).attr('data-team');
name = $( 'option[value=' + v + ']', $t ).attr('data-name');
tnam = WS.state['Game.Team(' + team + ').AlternateName(overlay)'];
tnam = tnam ? tnam : WS.state['Game.Team(' + team + ').Name'];
tnam = WS.state['ScoreBoard.Team(' + team + ').AlternateName(overlay)'];
tnam = tnam ? tnam : WS.state['ScoreBoard.Team(' + team + ').Name'];
f = $( '#LowerThirdStyle option[value=ColourTeam' + team + ']').attr('selected', 'selected').change();
$('input[data-setting="Custom.Overlay.LowerThird.Line1"]').val(name).change();
$('input[data-setting="Custom.Overlay.LowerThird.Line2"]').val(tnam).change();
Expand Down
8 changes: 4 additions & 4 deletions html/views/overlays/ddtv/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ function initialize() {

WS.Register( 'Game.Period', function(k,v) { jamData(k,v); } );

WS.Register( 'Game.Team(1)', function(k,v) { teamData(1, k,v); } );
WS.Register( 'Game.Team(2)', function(k,v) { teamData(2, k,v); } );
WS.Register( 'ScoreBoard.Team(1)', function(k,v) { teamData(1, k,v); } );
WS.Register( 'ScoreBoard.Team(2)', function(k,v) { teamData(2, k,v); } );

WS.Register( 'ScoreBoard.Clock(Period).Number', function(k,v) {
if(v == 2) { $('.PPJBox .Team .Period2').show(); } else { $('.PPJBox .Team .Period2').hide(); }
Expand Down Expand Up @@ -358,8 +358,8 @@ function pointsPerJamColumnWidths() {
wid = parseInt( $('.PPJBox').innerWidth() );
newwidth = parseInt(wid / nel) - 3;
$('.ColumnWidth').innerWidth(newwidth);
$('.PPJBox .Team1 .GraphBlock').css('backgroundColor', WS.state['Game.Team(1).Color(overlay_bg)']);
$('.PPJBox .Team2 .GraphBlock').css('backgroundColor', WS.state['Game.Team(2).Color(overlay_bg)']);
$('.PPJBox .Team1 .GraphBlock').css('backgroundColor', WS.state['ScoreBoard.Team(1).Color(overlay_bg)']);
$('.PPJBox .Team2 .GraphBlock').css('backgroundColor', WS.state['ScoreBoard.Team(2).Color(overlay_bg)']);
}

function clockType(k,v) {
Expand Down
12 changes: 6 additions & 6 deletions html/views/overlays/interactive/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ function initialize() {

WS.Register( 'Game.Period', function(k,v) { jamData(k,v); } );

WS.Register( 'Game.Team(1)', function(k,v) { teamData(1, k,v); } );
WS.Register( 'Game.Team(2)', function(k,v) { teamData(2, k,v); } );
WS.Register( 'ScoreBoard.Team(1)', function(k,v) { teamData(1, k,v); } );
WS.Register( 'ScoreBoard.Team(2)', function(k,v) { teamData(2, k,v); } );

WS.Register( 'ScoreBoard.Clock(Period).Number', function(k,v) {
if(v == 2) { $('.PPJBox .Team .Period2').show(); } else { $('.PPJBox .Team .Period2').hide(); }
Expand Down Expand Up @@ -125,17 +125,17 @@ function teamData(team, k,v) {
var key;
var setting;

var skaterRegEx = /^Game\.Team\((.+)\)\.Skater\((.+)\)\.(.+)$/;
var skaterRegEx = /^ScoreBoard\.Team\((.+)\)\.Skater\((.+)\)\.(.+)$/;
var match = k.match(skaterRegEx);
if(match) {
skaterId = match[2]; key = match[3]; penalty = null;
}

var penaltyRegEx = /^Game\.Team\((.+)\)\.Skater\((.+)\)\.Penalty\((.+)\).(.+)$/;
var penaltyRegEx = /^ScoreBoard\.Team\((.+)\)\.Skater\((.+)\)\.Penalty\((.+)\).(.+)$/;
var match = k.match(penaltyRegEx);
if(match) { skaterId = match[2]; key = match[4]; penalty = match[3]; }

var teamInfoRegEx = /^Game\.Team\((.+)\)\.(.+)$/;
var teamInfoRegEx = /^ScoreBoard\.Team\((.+)\)\.(.+)$/;
var match = k.match(teamInfoRegEx);
if(match) {
var subkey = match[2];
Expand All @@ -150,7 +150,7 @@ function teamData(team, k,v) {
}
}

var colourRegEx = /^Game\.Team\((.+)\)\.Color\((.+)\)$/;
var colourRegEx = /^ScoreBoard\.Team\((.+)\)\.Color\((.+)\)$/;
var match = k.match(colourRegEx);
if(match) {
var setting = match[2];
Expand Down
16 changes: 8 additions & 8 deletions html/views/overlays/wb/tcdg2016wb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ function initialize() {
WS.Register( [ 'ScoreBoard.Team(1).Logo' ], function(k, v) { $('.Logo1').attr('src', v); } );
WS.Register( [ 'ScoreBoard.Team(2).Logo' ], function(k, v) { $('.Logo2').attr('src', v); } );

WS.Register( [ 'Game.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'Game.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number
WS.Register( [ 'ScoreBoard.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'ScoreBoard.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number

}

Expand All @@ -54,8 +54,8 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
if (match == null || match.length == 0)
return;
var id = match[1]; // id = skater id
var prefix = 'Game.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = Game.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == Game.Team('team').Skater('id').Number
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = Game.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == ScoreBoard.Team('team').Skater('id').Number
var rowd = $('.Teamd' + t + ' .Skater.Penalty[id=' + id + ']');
if (v == null) { // if jam number is null
$('.Teamd' + t + ' .Skater[id=' + id + ']').remove();
Expand All @@ -68,7 +68,7 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
for (var i = 1; i <= 9; i++) { // for penalty numbers one to nine..
displayPenalty(t, id, i); } // display penalties (team, skater id, penalty #)
displayPenalty(t, id, 'FO_EXP'); // display foulout status
} else { // if skater id does NOT match Game.Team('team').Skater('id').Number
} else { // if skater id does NOT match ScoreBoard.Team('team').Skater('id').Number
// Look for penalty
match = k.match(penaltyRegex);
if (match == null || match.length == 0)
Expand All @@ -82,8 +82,8 @@ function displayPenalty(t, s, p) { // team skater penalty#
var penaltyBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Box' + p);
var totalBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Total');

var prefix = 'Game.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'Game.Team(' + t + ').Skater(' + s + ')';
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ')';
code = WS.state[prefix + ".Code"];
if (code != null) {
penaltyBoxd.data("id", WS.state[prefix + ".Id"]);
Expand Down Expand Up @@ -123,7 +123,7 @@ function makeSkaterRows(t, id, number) { //team, id, number
$('.Team' + t + 'custColor').css('background-color', teamBColor);

pd.append($('<div width=10%>').addClass('Number').text(number));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['Game.Team(' + t + ').Skater(' + id + ').Name']));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['ScoreBoard.Team(' + t + ').Skater(' + id + ').Name']));
$.each([1, 2, 3, 4, 5, 6, 7, 8, 9], function(idx, c) {
pd.append($('<div width=10%>').addClass('Box Box' + c).html('&nbsp;'));
});
Expand Down
16 changes: 8 additions & 8 deletions html/views/overlays/wb/tcdg2016wb_underlay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ function initialize() {
WS.Register( [ 'ScoreBoard.Team(1).Logo' ], function(k, v) { $('.Logo1').attr('src', v); } );
WS.Register( [ 'ScoreBoard.Team(2).Logo' ], function(k, v) { $('.Logo2').attr('src', v); } );

WS.Register( [ 'Game.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'Game.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number
WS.Register( [ 'ScoreBoard.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'ScoreBoard.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number

}

Expand All @@ -54,8 +54,8 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
if (match == null || match.length == 0)
return;
var id = match[1]; // id = skater id
var prefix = 'Game.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = Game.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == Game.Team('team').Skater('id').Number
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = Game.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == ScoreBoard.Team('team').Skater('id').Number
var rowd = $('.Teamd' + t + ' .Skater.Penalty[id=' + id + ']');
if (v == null) { // if jam number is null
$('.Teamd' + t + ' .Skater[id=' + id + ']').remove();
Expand All @@ -68,7 +68,7 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
for (var i = 1; i <= 9; i++) { // for penalty numbers one to nine..
displayPenalty(t, id, i); } // display penalties (team, skater id, penalty #)
displayPenalty(t, id, 'FO_EXP'); // display foulout status
} else { // if skater id does NOT match Game.Team('team').Skater('id').Number
} else { // if skater id does NOT match ScoreBoard.Team('team').Skater('id').Number
// Look for penalty
match = k.match(penaltyRegex);
if (match == null || match.length == 0)
Expand All @@ -82,8 +82,8 @@ function displayPenalty(t, s, p) { // team skater penalty#
var penaltyBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Box' + p);
var totalBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Total');

var prefix = 'Game.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'Game.Team(' + t + ').Skater(' + s + ')';
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ')';
code = WS.state[prefix + ".Code"];
if (code != null) {
penaltyBoxd.data("id", WS.state[prefix + ".Id"]);
Expand Down Expand Up @@ -123,7 +123,7 @@ function makeSkaterRows(t, id, number) { //team, id, number
$('.Team' + t + 'custColor').css('background-color', teamBColor);

pd.append($('<div width=10%>').addClass('Number').text(number));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['Game.Team(' + t + ').Skater(' + id + ').Name']));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['ScoreBoard.Team(' + t + ').Skater(' + id + ').Name']));
$.each([1, 2, 3, 4, 5, 6, 7, 8, 9], function(idx, c) {
pd.append($('<div width=10%>').addClass('Box Box' + c).html('&nbsp;'));
});
Expand Down
16 changes: 8 additions & 8 deletions html/views/wb/tcdg2016wb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function initialize() {
WS.Register( [ 'ScoreBoard.Team(1).Logo' ], function(k, v) { $('.Logo1').attr('src', v); } );
WS.Register( [ 'ScoreBoard.Team(2).Logo' ], function(k, v) { $('.Logo2').attr('src', v); } );

WS.Register( [ 'Game.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'Game.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number
WS.Register( [ 'ScoreBoard.Team(1).Skater' ], function(k, v) { skaterUpdate(1, k, v); } ); //called when skater info changes?
WS.Register( [ 'ScoreBoard.Team(2).Skater' ], function(k, v) { skaterUpdate(2, k, v); } ); //arguments: team number, skater id, jam number

}

Expand All @@ -53,8 +53,8 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
if (match == null || match.length == 0)
return;
var id = match[1]; // id = skater id
var prefix = 'Game.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = Game.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == Game.Team('team').Skater('id').Number
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + id + ')'; //Example: prefix = ScoreBoard.Team('1').Skater('id')
if (k == prefix + '.Number') { //Example if skater id == ScoreBoard.Team('team').Skater('id').Number
var rowd = $('.Teamd' + t + ' .Skater.Penalty[id=' + id + ']');
if (v == null) { // if jam number is null
$('.Teamd' + t + ' .Skater[id=' + id + ']').remove();
Expand All @@ -67,7 +67,7 @@ function skaterUpdate(t, k, v) { //arguments: team number, skater id, jam number
for (var i = 1; i <= 9; i++) { // for penalty numbers one to nine..
displayPenalty(t, id, i); } // display penalties (team, skater id, penalty #)
displayPenalty(t, id, 'FO_EXP'); // display foulout status
} else { // if skater id does NOT match Game.Team('team').Skater('id').Number
} else { // if skater id does NOT match ScoreBoard.Team('team').Skater('id').Number
// Look for penalty
match = k.match(penaltyRegex);
if (match == null || match.length == 0)
Expand All @@ -81,8 +81,8 @@ function displayPenalty(t, s, p) { // team skater penalty#
var penaltyBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Box' + p);
var totalBoxd = $('.Teamd' + t + ' .Skater.Penalty[id=' + s + '] .Total');

var prefix = 'Game.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'Game.Team(' + t + ').Skater(' + s + ')';
var prefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ').Penalty(' + p + ')';
var nprefix = 'ScoreBoard.Team(' + t + ').Skater(' + s + ')';
code = WS.state[prefix + ".Code"];
if (code != null) {
penaltyBoxd.data("id", WS.state[prefix + ".Id"]);
Expand Down Expand Up @@ -122,7 +122,7 @@ function makeSkaterRows(t, id, number) { //team, id, number
$('.Team' + t + 'custColor').css('background-color', teamBColor);

pd.append($('<div width=10%>').addClass('Number').text(number));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['Game.Team(' + t + ').Skater(' + id + ').Name']));
pd.append($('<div width=50%>').addClass('Name').text(WS.state['ScoreBoard.Team(' + t + ').Skater(' + id + ').Name']));
$.each([1, 2, 3, 4, 5, 6, 7, 8, 9], function(idx, c) {
pd.append($('<div width=10%>').addClass('Box Box' + c).html('&nbsp;'));
});
Expand Down
Loading

0 comments on commit 13734f0

Please sign in to comment.