Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'section_6_1' into section_6_2

Conflicts:
	app/assets/javascripts/autocompleteSelector.js
  • Loading branch information...
commit e0aa4a3cbeea44e6a7bafa5710fe1f4f46b7e2d4 2 parents d9963c1 + 23dbfc2
Noel Rappin authored
View
2  app/assets/javascripts/application.js
@@ -9,7 +9,7 @@
//= require jquery-ui
//= require_tree .
-activityData = {1: "Hiking", 2: "Changing History",
+activityData = {1: "Hiking", 2: "Changing History",
3: "Baseball", 4: "Programming"}
$(function() {
View
2  app/assets/javascripts/toggler.js
@@ -24,7 +24,7 @@ var Toggler = (function() {
},
detailElement: function() {
- return this.link.parent().find(this.detailSelector);
+ return this.$link.parent().find(this.detailSelector);
},
isDetailHidden: function() {
Please sign in to comment.
Something went wrong with that request. Please try again.