From 89d102aa1fe12e132b5d3611d3fc7487d91f0ca7 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 13 Sep 2013 18:23:02 +0200 Subject: [PATCH 1/3] do not show border on if habit has only + action --- views/tasks/task.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/tasks/task.jade b/views/tasks/task.jade index 8572424f3f..b4c8094a2c 100644 --- a/views/tasks/task.jade +++ b/views/tasks/task.jade @@ -36,8 +36,8 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use // Habits span(ng-if='list.main && task.type=="habit"') // only allow scoring on main tasks, not when viewing others' public tasks or when creating challenges - a.task-action-btn(ng-show='task.up', ng-click='score(task,"up")') + - a.task-action-btn(ng-show='task.down', ng-click='score(task,"down")') - + 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")') - //span(ng-if='!list.main') // span.task-action-btn(ng-show='task.up') + // span.task-action-btn(ng-show='task.down') = From 8748907841e08ee4280020fbcc1d96cae5a341a9 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 13 Sep 2013 18:24:32 +0200 Subject: [PATCH 2/3] update angular to 1.2.0-rc.2 --- bower.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 6411c5a5d5..0fdccae792 100644 --- a/bower.json +++ b/bower.json @@ -15,8 +15,8 @@ ], "dependencies": { "jquery": "~2.0.3", - "angular": "1.2.0-rc.1", - "angular-resource": "1.2.0-rc.1", + "angular": "1.2.0-rc.2", + "angular-resource": "1.2.0-rc.2", "angular-ui": "~0.4.0", "angular-bootstrap": "~0.5.0", "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite", @@ -29,9 +29,9 @@ "sticky": "*", "bootstrap-datepicker": "~1.2.0", "bootstrap": "v2.3.2", - "angular-route": "1.2.0-rc.1", + "angular-route": "1.2.0-rc.2", "angular-ui-utils": "~0.0.4", - "angular-sanitize": "1.2.0-rc.1", + "angular-sanitize": "1.2.0-rc.2", "marked": "~0.2.9" }, "resolutions": { From 98fa007f365e0f98f8d9a05b24cf336b586261b2 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 13 Sep 2013 20:01:22 +0200 Subject: [PATCH 3/3] do not trigger validation error on float number, fix #1463 --- views/shared/modals/settings.jade | 6 +++--- views/tasks/task.jade | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index 3467a49fe5..fd493e6909 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -18,13 +18,13 @@ div(ng-controller='SettingsCtrl') form#restore-form.form-horizontal h3 Stats .option-group.option-medium - input.option-content(type='number', data-for='stats.hp', ng-model='user.stats.hp') + input.option-content(type='number', step="any", data-for='stats.hp', ng-model='user.stats.hp') span.input-suffix HP .option-group.option-medium - input.option-content(type='number', data-for='stats.exp', ng-model='user.stats.exp') + input.option-content(type='number', step="any", data-for='stats.exp', ng-model='user.stats.exp') span.input-suffix Exp .option-group.option-medium - input.option-content(type='number', data-for='stats.gp', ng-model='user.stats.gp') + input.option-content(type='number', step="any", data-for='stats.gp', ng-model='user.stats.gp') span.input-suffix GP .option-group.option-medium input.option-content(type='number', data-for='stats.lvl', ng-model='user.stats.lvl') diff --git a/views/tasks/task.jade b/views/tasks/task.jade index b4c8094a2c..02140474ef 100644 --- a/views/tasks/task.jade +++ b/views/tasks/task.jade @@ -117,7 +117,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use // if Reward, pricing fieldset.option-group.option-short(ng-if='task.type=="reward"') legend.option-title Price - input.option-content(type='number', size='16', min='0', ng-model='task.value') + input.option-content(type='number', size='16', min='0', step="any", ng-model='task.value') .money.input-suffix span.shop_gold // if Todos, the due date