diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /app/assets/javascripts/ajax.js | |
parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
parent | aca85cf084702c29014a17eafb090421061fae8b (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/assets/javascripts/ajax.js')
-rw-r--r-- | app/assets/javascripts/ajax.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js index 475dddc..31578dd 100644 --- a/app/assets/javascripts/ajax.js +++ b/app/assets/javascripts/ajax.js @@ -5,7 +5,7 @@ function populate() { var gameType = e.options[e.selectedIndex].text; if (gameType != "Select a Game Type") { alert(gameType + " was Selected!"); - //populate optionArray + //populate optionArray via AJAX //select * from tournament_settings where gametype = GameType for(var option in optionArray){ //identify the number of |