Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Misc bug fixes #920

Merged
merged 3 commits into from
Jan 2, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/directives/challenge-links/challenge-links.jade
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.challenge-links(ng-class="view + '-view'")
a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack")
a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack", target="_self")
.icon.registrants-icon
p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}}
p(ng-switch-default) {{challenge.numRegistrants}}

a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}")
a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}", target="_self")
.icon.submissions-icon
p {{challenge.numSubmissions}}

8 changes: 8 additions & 0 deletions app/my-challenges/my-challenges.controller.js
Original file line number Diff line number Diff line change
@@ -146,6 +146,14 @@ import _ from 'lodash'
vm.getChallenges(currentOffset, false)
}

window.onscroll = function() {
if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
if (vm.totalCount > vm.myChallenges.length) {
vm.loadMore()
}
}
}

function _checkForParticipation() {
return ChallengeService.checkChallengeParticipation(vm.handle, function(participated) {
vm.neverParticipated = !participated
9 changes: 3 additions & 6 deletions app/my-challenges/my-challenges.jade
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.my-challenges-container
.my-challenges

.page-header
page-state-header(handle="{{vm.handle}}", page-title="My Challenges", hide-money="true", show-back-link="true", default-state="dashboard")

@@ -26,10 +26,7 @@

.hasChallenges(ng-show="vm.myChallenges.length", state="vm.loading")

.data(ng-class="vm.view + '-view'")
.data(ng-class="vm.view + '-view'")
challenge-tile(
ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true",
ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true",
challenge="challenge", view="vm.view", ng-class="vm.view + '-view'")

tc-section.load-more-section(state="vm.loading")
button.tc-btn(ng-show="vm.totalCount > vm.myChallenges.length", ng-click="vm.loadMore()") Load More
3 changes: 3 additions & 0 deletions assets/css/community/members.scss
Original file line number Diff line number Diff line change
@@ -65,6 +65,9 @@
color: #a3a3ae;
font-size: 12px;
font-weight: 400;
@media only screen and (max-width: 768px) {
font-size: 5vw;
}
}
}