Skip to content
Browse files

Merge branch 'master' of github.com:Jarred-Sumner/FundingList.us

  • Loading branch information...
2 parents 7ffd466 + d014384 commit 2fc92666a9ddd33cd75ddca64f5416accf747b50 Jarred Sumner committed Feb 22, 2012
View
3 app/assets/javascripts/application.js.coffee
@@ -1,6 +1,3 @@
//= require jquery
//= require jquery_ujs
//= require highcharts
-
-# Note: I add "//= require" directives to the top of files when only a single view is dependent on it.
-# This is essentially a global dependencies file.
View
16 app/assets/javascripts/show_companies.js.coffee
@@ -1,7 +1,7 @@
//= require bootstrap-modal
//= require accounting.min
-start_page = $(document).ready ->
+$(document).ready ->
change_to_round = (date, raised, company) ->
console.log(company)
# While this is O(n), the highest is probably going to be around 16, so it really doesn't matter.
@@ -49,17 +49,5 @@ start_page = $(document).ready ->
tooltip:
formatter: ->
"<strong>Raised: #{accounting.formatMoney(@point.y)}</strong>"
- $("#update_me_modal").modal()
- $("#update_me_modal").modal('hide')
- $("#update_me").click ->
- $("#update_me_modal").modal("show")
- $("#update_email").focus()
- $("#update_me_modal").keyup (evt) ->
- $("#keep_updated_button").trigger("click") if evt.keyCode == 13
- $(".hide_modal").click ->
- $("#update_me_modal").modal('hide')
- $("#keep_updated_button").click ->
- $("#success_alert").removeClass("hidden").children("#success_alert_text").text("We'll keep you updated on this company's funding!")
- $.getJSON location.pathname + '/subscribe.json?&email=' + $("#update_email").val()
- $("#success_alert").removeClass('hidden') unless $("#success_alert_text").text() == ''
+
create_chart()
View
3 app/views/companies/show.html.erb
@@ -6,9 +6,6 @@
<h1><%= @company.name %></h1>
<div id='chart'>
</div>
- <div id='update_me_container'>
- <div id='update_me' class='btn btn-primary'>Keep Me Updated</div>
- </div>
<div id="more_info">
<%= render 'related_people' %>
<%= render 'rounds' %>

0 comments on commit 2fc9266

Please sign in to comment.
Something went wrong with that request. Please try again.