diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 13:07:25 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 13:07:25 -0400 |
commit | 1ea3366c70ad87f2c0d3fa3ae3a56f27b691f696 (patch) | |
tree | 5446ee7a134b0aab31d4a232008f96acd88a291a /app/assets/javascripts | |
parent | 395a12042bbe9c4eeca60e41c75004c3bdad4e87 (diff) |
clean up the javascript everywhere
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/ajax.js | 19 | ||||
-rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/matches_show.js.coffee | 2 | ||||
-rw-r--r-- | app/assets/javascripts/tournaments_show.js.coffee | 30 |
4 files changed, 34 insertions, 20 deletions
diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js deleted file mode 100644 index 040c100..0000000 --- a/app/assets/javascripts/ajax.js +++ /dev/null @@ -1,19 +0,0 @@ -function populate() { - //populate optionArray - //make a form element - var e = document.getElementById("tournament_id"); - var gameType = e.options[e.selectedIndex].text; - if (gameType != "Select a Game Type") { - alert(gameType + " was Selected!"); - //populate optionArray via AJAX - //select * from tournament_settings where gametype = GameType - for(var option in optionArray){ - //identify the number of - ; - } - }; - -//$.ajax(url: "/selected").done (html) -> $("#ajax-form").append html - -} - diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cb6edeb..e9430a3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,7 +13,8 @@ //= require jquery //= require jquery_ujs //= require turbolinks -//= require_tree . //= require 'drag.js' //= require 'dragsort.js' //= require 'coordinates.js' +// +//= require_tree ./common diff --git a/app/assets/javascripts/matches_show.js.coffee b/app/assets/javascripts/matches_show.js.coffee new file mode 100644 index 0000000..2609a69 --- /dev/null +++ b/app/assets/javascripts/matches_show.js.coffee @@ -0,0 +1,2 @@ +window.onload = -> + BetterDragSort.makeListSortable(document.getElementById("boxes")); diff --git a/app/assets/javascripts/tournaments_show.js.coffee b/app/assets/javascripts/tournaments_show.js.coffee new file mode 100644 index 0000000..1e91d3a --- /dev/null +++ b/app/assets/javascripts/tournaments_show.js.coffee @@ -0,0 +1,30 @@ +Update = (tournament) -> + here = tournament["players"].length + needed = (tournament["min_teams_per_match"] * tournament["min_players_per_team"]) + pct_complete = here / needed + + $("#prog-bar").width (pct_complete * 100) + "%" + $("#players-needed").text here + " " + ((if here is 1 then "player has" else "players have")) + " signed up. " + needed + " players needed. " + + # Update the user list + players = "" + for player in tournament["players"] + players = players + "<li><span class=\"black\">" + player["user_name"] + "</span></li>" + $("#tournament-users").html players + + # Enable/disable the "start" button depending on the number of players + $("input[value=\"Start Tournament\"]").prop "disabled", (if (pct_complete >= 1) then false else true) + + # Switch views if the tournament has been started + if tournament["status"] is 1 + window.location.reload true + + # Do it all again + setTimeout (-> + $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update + return + ), 2000 + +# Now kick off the whole process +window.onload = -> + $.ajax(url: window.location.href.replace(/\..*/,'')+".json").done Update |