From 7037e1c8eb303518e531da5c155d7771cb2458bc Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 1 Nov 2013 10:20:14 -0700 Subject: [PATCH] [#1672] don't allow clicking checkboxes on challenge-editing page --- public/js/controllers/challengesCtrl.js | 2 ++ views/shared/tasks/task.jade | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/js/controllers/challengesCtrl.js b/public/js/controllers/challengesCtrl.js index 811f6c3ea2..d1a9ab823b 100644 --- a/public/js/controllers/challengesCtrl.js +++ b/public/js/controllers/challengesCtrl.js @@ -35,6 +35,8 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica if (gid == 'habitrpg') $scope.newChallenge.prize = 1; }) + // override score() for tasks listed in challenges-editing pages, so that nothing happens + $scope.score = function(){} //------------------------------------------------------------ // Challenge diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 12a0e8df60..7272f3872b 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -41,6 +41,7 @@ li(ng-repeat='task in obj[list.type+"s"]', class='task {{taskClasses(task, user. // Habits span(ng-if='task.type=="habit"') + // score() is overridden in challengesCtrl to do nothing a.task-action-btn(ng-if='task.up', ng-click='score(task,"up")') + a.task-action-btn(ng-if='task.down', ng-click='score(task,"down")') - @@ -52,7 +53,8 @@ li(ng-repeat='task in obj[list.type+"s"]', class='task {{taskClasses(task, user. // Daily & Todos span.task-checker.action-yesno(ng-if='task.type=="daily" || task.type=="todo"') - input.visuallyhidden.focusable(id='box-{{obj._id}}_{{task.id}}', type='checkbox', ng-model='task.completed', ng-change='changeCheck(task)') + input.visuallyhidden.focusable(ng-if='$state.includes("tasks")', id='box-{{obj._id}}_{{task.id}}', type='checkbox', ng-model='task.completed', ng-change='changeCheck(task)') + input.visuallyhidden.focusable(ng-if='!$state.includes("tasks")', id='box-{{obj._id}}_{{task.id}}', type='checkbox') label(for='box-{{obj._id}}_{{task.id}}') // main content p.task-text