Skip to content

Commit 9c5f5f4

Browse files
just3wsjust3ws
committed
Merge pull request #155 from Mileshosky/wip-318
Proper ember template paths
2 parents e053e78 + 5ff5dbc commit 9c5f5f4

15 files changed

+31
-31
lines changed

‎app/assets/javascripts/ember/views/events/achievement.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.AchievementEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/achievement"
2+
templateName: "events/achievement"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -9,4 +9,4 @@ Coderwall.AchievementEventView = Ember.View.extend(
99
classnames.join(" ")
1010
).property().cacheable()
1111

12-
)
12+
)

‎app/assets/javascripts/ember/views/events/activity_feed.js.coffee

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.ActivityListView = Ember.CollectionView.create(
2-
# templateName: "ember/templates/events/activity_list"
2+
# templateName: "events/activity_list"
33
contentBinding: "Coderwall.activityFeedController.activities"
44
tagName: "ul"
55
createChildView: (view, attrs) ->
@@ -35,7 +35,7 @@ Coderwall.ActivityListView = Ember.CollectionView.create(
3535
)
3636

3737
Coderwall.MoreActivityView = Ember.View.create(
38-
#templateName: "ember/templates/events/more_activity"
38+
#templateName: "events/more_activity"
3939
classNameBindings: ["visibility"]
4040
tagName: "li"
4141

@@ -60,7 +60,7 @@ Coderwall.ActivityFeedView = Ember.ContainerView.create(
6060
)
6161

6262
Coderwall.ActivityStatsView = Ember.View.create(
63-
#templateName: "ember/templates/events/stats"
63+
#templateName: "events/stats"
6464
tagName: "ul"
6565
profileViewsBinding: "Coderwall.statsController.profileViews"
6666
followersBinding: "Coderwall.statsController.followers"

‎app/assets/javascripts/ember/views/events/admin.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.AdminEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/admin"
2+
templateName: "events/admin"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -9,4 +9,4 @@ Coderwall.AdminEventView = Ember.View.extend(
99
classnames.join(" ")
1010
).property().cacheable()
1111

12-
)
12+
)

‎app/assets/javascripts/ember/views/events/comment.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.CommentEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/comment"
2+
templateName: "events/comment"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["commentEvent"]
@@ -15,4 +15,4 @@ Coderwall.CommentEventView = Ember.View.extend(
1515

1616
didInsertElement: ->
1717
registerToggles()
18-
)
18+
)

‎app/assets/javascripts/ember/views/events/endorsement.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.EndorsementEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/endorsement"
2+
templateName: "events/endorsement"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["endorsementEvent"]
@@ -9,4 +9,4 @@ Coderwall.EndorsementEventView = Ember.View.extend(
99
classnames.join(" ")
1010
).property().cacheable()
1111

12-
)
12+
)

‎app/assets/javascripts/ember/views/events/event.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.EventView = Ember.View.extend(
2-
templateName: "ember/templates/events/activity_list"
2+
templateName: "events/activity_list"
33
activityBinding: "Coderwall.activityFeedController.activities"
44

5-
)
5+
)

‎app/assets/javascripts/ember/views/events/expert.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.ExpertEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/expert"
2+
templateName: "events/expert"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["expertEvent"]
@@ -12,4 +12,4 @@ Coderwall.ExpertEventView = Ember.View.extend(
1212
classnames.join(" ")
1313
).property().cacheable()
1414

15-
)
15+
)

‎app/assets/javascripts/ember/views/events/follow.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.FollowEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/follow"
2+
templateName: "events/follow"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["followEvent"]
@@ -10,4 +10,4 @@ Coderwall.FollowEventView = Ember.View.extend(
1010
classnames.join(" ")
1111
).property().cacheable()
1212

13-
)
13+
)

‎app/assets/javascripts/ember/views/events/protip.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.ProtipEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/protip"
2+
templateName: "events/protip"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -15,4 +15,4 @@ Coderwall.ProtipEventView = Ember.View.extend(
1515

1616
didInsertElement: ->
1717
registerToggles()
18-
)
18+
)

‎app/assets/javascripts/ember/views/events/skill.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.SkillEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/skill"
2+
templateName: "events/skill"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -18,4 +18,4 @@ Coderwall.SkillEventView = Ember.View.extend(
1818
classnames.join(" ")
1919
).property().cacheable()
2020

21-
)
21+
)

‎app/assets/javascripts/ember/views/events/team.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.TeamEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/team"
2+
templateName: "events/team"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -16,4 +16,4 @@ Coderwall.TeamEventView = Ember.View.extend(
1616
classnames.join(" ")
1717
).property().cacheable()
1818

19-
)
19+
)

‎app/assets/javascripts/ember/views/events/view.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Coderwall.ViewEventView = Ember.View.extend(
2-
templateName: "ember/templates/events/view"
2+
templateName: "events/view"
33
eventBinding: 'content'
44
tagName: "li"
55
classNameBindings: ["protipEvent"]
@@ -14,4 +14,4 @@ Coderwall.ViewEventView = Ember.View.extend(
1414
classnames.join(" ")
1515
).property().cacheable()
1616

17-
)
17+
)

‎app/assets/javascripts/ember/views/networks/network.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Coderwall.AllNetworksView = Ember.View.create(
77

88
templateName: (->
99
templateName = if @get('sortOrder')? then @get('sortOrder') else "a_z"
10-
"ember/templates/networks/all_networks/" + templateName
10+
"networks/all_networks/" + templateName
1111
).property("sortOrder").cacheable()
1212

1313
sortByAlpyhabet: ->
@@ -26,4 +26,4 @@ Coderwall.AllNetworksView = Ember.View.create(
2626

2727
)
2828

29-
Coderwall.AllNetworksView.appendTo('#networks')
29+
Coderwall.AllNetworksView.appendTo('#networks')

‎app/assets/javascripts/ember/views/teams/index.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Coderwall.ListTeamsView = Ember.View.extend(
2-
templateName: "ember/templates/teams/index"
2+
templateName: "teams/index"
33
teamsBinding: "Coderwall.teamsController"
44

55
refreshListing: ->
66
Coderwall.teamsController.findAll()
7-
)
7+
)

‎app/assets/javascripts/ember/views/teams/show.js.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Coderwall.ShowTeamView = Ember.View.extend(
2-
templateName: "ember/templates/teams/show"
2+
templateName: "teams/show"
33
classNames: [ "team" ]
44
tagName: "tr"
55

66
follow: (e)->
77
team = @get("team")
88
team.follow()
99
e.preventDefault()
10-
)
10+
)

0 commit comments

Comments
 (0)