From e0db76ac2045d5da06bf53c1d4451d9d01e9c013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 19 Sep 2014 12:23:45 +0200 Subject: [PATCH] Fix issue #1031 --- app/coffee/modules/common/components.coffee | 9 --------- app/coffee/modules/common/confirm.coffee | 2 +- app/partials/views/modules/lightbox-sprint-add-edit.jade | 6 ++---- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index a3cc656d..04200fe4 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -91,15 +91,6 @@ DateSelectorDirective =-> $el.picker.setDate(selectedDate) if selectedDate? }) - if $attrs.greaterThan - $scope.$watch $attrs.greaterThan, (val) -> - $el.picker.setMinDate(moment(val)) - - if $attrs.lessThan - $scope.$watch $attrs.lessThan, (val) -> - $el.picker.setMaxDate(moment(val)) - - $scope.$watch $attrs.ngModel, (val) -> $el.picker.setDate(val) if val? diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee index b1c0e381..a0da50ac 100644 --- a/app/coffee/modules/common/confirm.coffee +++ b/app/coffee/modules/common/confirm.coffee @@ -184,7 +184,7 @@ class ConfirmService extends taiga.Service if @.tsem cancelTimeout(@.tsem) - time = if type == 'error' then 3500 else 1500 + time = if type == 'error' or type == 'light-error' then 3500 else 1500 @.tsem = timeout time, => body.find(selector) diff --git a/app/partials/views/modules/lightbox-sprint-add-edit.jade b/app/partials/views/modules/lightbox-sprint-add-edit.jade index eb62663f..6ded594b 100644 --- a/app/partials/views/modules/lightbox-sprint-add-edit.jade +++ b/app/partials/views/modules/lightbox-sprint-add-edit.jade @@ -10,12 +10,10 @@ form fieldset.dates div input.date-start(type="text", name="estimated_start", placeholder="Estimated Start", - ng-model="sprint.estimated_start", data-required="true", tg-date-selector, - less-than="sprint.estimated_finish") + ng-model="sprint.estimated_start", data-required="true", tg-date-selector) div input.date-end(type="text", name="estimated_finish", placeholder="Estimated End", - ng-model="sprint.estimated_finish", data-required="true", tg-date-selector - greater-than="sprint.estimated_start") + ng-model="sprint.estimated_finish", data-required="true", tg-date-selector) a.button.button-green(href="", title="Save") span Create