Centralize date time directives in single file

pull/1610/head
Hagen Schink 10 years ago
parent f78f587c11
commit f1e2d07c8c
  1. 18
      app/assets/javascripts/angular/directives/components/date-directive.js
  2. 44
      app/assets/javascripts/angular/directives/components/formatted-date-directive.js

@ -27,9 +27,9 @@
//++
// TODO move to UI components
angular.module('openproject.uiComponents')
var uiComponents = angular.module('openproject.uiComponents')
.directive('date', ['I18n', 'TimezoneService', function(I18n, TimezoneService) {
uiComponents.directive('date', ['I18n', 'TimezoneService', function(I18n, TimezoneService) {
return {
restrict: 'EA',
replace: false,
@ -42,3 +42,17 @@ angular.module('openproject.uiComponents')
}
};
}]);
uiComponents.directive('time', ['I18n', 'TimezoneService', function(I18n, TimezoneService) {
return {
restrict: 'EA',
replace: false,
scope: { time: '=' },
template: '<span>{{time}}</span>',
link: function(scope, element, attrs) {
moment.lang(I18n.locale);
scope.time = TimezoneService.parseDate(scope.time).format('LT');
}
};
}]);

@ -1,44 +0,0 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See doc/COPYRIGHT.rdoc for more details.
//++
// TODO move to UI components
angular.module('openproject.uiComponents')
.directive('formattedDate', ['I18n', 'TimezoneService', function(I18n, TimezoneService) {
return {
restrict: 'EA',
replace: false,
scope: { formattedDate: '=' },
template: '<span>{{time}}</span>',
link: function(scope, element, attrs) {
moment.lang(I18n.locale);
scope.time = TimezoneService.parseDate(scope.formattedDate).format('LLL');
}
};
}]);
Loading…
Cancel
Save