From c47606c5b2c7bf4f327d030b097b108c96e248ee Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Tue, 17 Mar 2015 07:49:37 +1000 Subject: [PATCH] remove Show Tour button from Settings->Site; (unrelated to that) delete an outdated comment --- common/dist/scripts/habitrpg-shared.js | 1 + common/script/index.coffee | 1 - website/views/options/settings.jade | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/dist/scripts/habitrpg-shared.js b/common/dist/scripts/habitrpg-shared.js index ea7afa7f1c..4f5ac0ac59 100644 --- a/common/dist/scripts/habitrpg-shared.js +++ b/common/dist/scripts/habitrpg-shared.js @@ -7123,6 +7123,7 @@ process.browser = true; process.env = {}; process.argv = []; process.version = ''; // empty string to avoid regexp issues +process.versions = {}; function noop() {} diff --git a/common/script/index.coffee b/common/script/index.coffee index 4f90b9692b..ab1e23904b 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -1069,7 +1069,6 @@ api.wrap = (user, main=true) -> if (user.preferences.automaticAllocation is true and user.preferences.allocationMode is 'taskbased' and !(task.type is 'todo' and direction is 'down')) then user.stats.training[task.attribute] += nextDelta # ===== STRENGTH ===== # (Only for up-scoring, ignore up-onlies and rewards) - # Note, we create a new val (adjustAmt) to add to task.value, since delta will be used in Exp & GP calculations - we don't want STR to bonus that if direction is 'up' and !(task.type is 'habit' and !task.down) user.party.quest.progress.up = user.party.quest.progress.up || 0; user.party.quest.progress.up += (nextDelta * (1 + (user._statsComputed.str / 200))) if task.type in ['daily','todo'] diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 92eeaadce9..643b4da4ae 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -66,7 +66,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') label input(type='checkbox', ng-model='user.preferences.dailyDueDefaultView', ng-change='set({"preferences.dailyDueDefaultView": user.preferences.dailyDueDefaultView?true: false})') span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('dailyDueDefaultViewPop'))=env.t('dailyDueDefaultView') - button.btn.btn-default(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover=env.t('restartTour'))= env.t('showTour') + // button.btn.btn-default(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover=env.t('restartTour'))= env.t('showTour') button.btn.btn-default(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey') button.btn.btn-default(ng-click='openRestoreModal()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal') button.btn.btn-default(ng-click="openModal('invite-friends', {controller:'GroupsCtrl'})") Invite Friends