Skip to content
Browse files

Merge branch 'section_9_1' into section_9_2

  • Loading branch information...
2 parents f1cdb96 + ba013c7 commit e25f5f63c4e23567475a458e92155ce9f33cbba4 Noel Rappin committed May 25, 2013
Showing with 4 additions and 4 deletions.
  1. +1 −1 .gitignore
  2. +2 −2 app/views/home/index.html.erb
  3. +1 −1 spec/javascripts/autocompleteSpec.js
View
2 .gitignore
@@ -4,4 +4,4 @@ log/*.log
tmp/
.sass-cache/
public/assets/
-.idea
+.idea
View
4 app/views/home/index.html.erb
@@ -1,7 +1,7 @@
<%= content_for :javascript do -%>
<%= javascript_tag do %>
$(function() {
- TimeTravel.init(<%== @trips.to_json %>);
+ TimeTravel.init(<%= @trips.to_json %>);
});
<% end %>
-<% end -%>
+<% end -%>
View
2 spec/javascripts/autocompleteSpec.js
@@ -128,7 +128,7 @@ describe("Autocomplete widget", function() {
addbutton = $("#autodiv a#user_activity_ids_add_button");
inputElement.val('Beta');
addbutton.click();
- ul = $("#autodiv #user_activity_ids_list");
+ this.ul = $("#autodiv #user_activity_ids_list");
deleteButton = ul.find("#user_activity_ids_element_2 .delete-button");
deleteButton.click();
});

0 comments on commit e25f5f6

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