diff --git a/frontend/app/components/common/lodash/lodash.service.test.ts b/frontend/app/components/common/lodash/lodash.service.test.ts deleted file mode 100644 index dec7162301..0000000000 --- a/frontend/app/components/common/lodash/lodash.service.test.ts +++ /dev/null @@ -1,41 +0,0 @@ -// -- copyright -// OpenProject is a project management system. -// Copyright (C) 2012-2015 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. -// ++ - -describe('lodash service', () => { - var lodash; - - beforeEach(angular.mock.module('openproject.services')); - - beforeEach(angular.mock.inject((___) => { - lodash = ___; - })); - - it('should return the global lodash instance', () => { - expect(lodash.name).to.eq('lodash'); - }); -}); diff --git a/frontend/app/components/common/lodash/lodash.service.ts b/frontend/app/components/common/lodash/lodash.service.ts deleted file mode 100644 index 77c61bd7dd..0000000000 --- a/frontend/app/components/common/lodash/lodash.service.ts +++ /dev/null @@ -1,37 +0,0 @@ -// -- copyright -// OpenProject is a project management system. -// Copyright (C) 2012-2015 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. -// ++ - -import LoDashStatic = _.LoDashStatic; - -function lodash():LoDashStatic { - return _; -} - -angular - .module('openproject.services') - .factory('_', lodash); diff --git a/frontend/app/components/wp-buttons/wp-filter-button/wp-filter-button.directive.ts b/frontend/app/components/wp-buttons/wp-filter-button/wp-filter-button.directive.ts index 5f154bcb05..ff6213db06 100644 --- a/frontend/app/components/wp-buttons/wp-filter-button/wp-filter-button.directive.ts +++ b/frontend/app/components/wp-buttons/wp-filter-button/wp-filter-button.directive.ts @@ -44,7 +44,7 @@ export class WorkPackageFilterButtonController extends WorkPackageButtonControll public buttonId:string = 'work-packages-filter-toggle-button'; public iconClass:string = 'icon-filter'; - constructor(public I18n, public _, protected wpFiltersService:WorkPackageFiltersService) { + constructor(public I18n, protected wpFiltersService:WorkPackageFiltersService) { 'ngInject'; super(I18n); @@ -63,7 +63,7 @@ export class WorkPackageFilterButtonController extends WorkPackageButtonControll } public get filterCount():number { - return this._.size(_.where(this.filters, filter => !filter.deactivated)); + return _.size(_.where(this.filters, filter => !filter.deactivated)); } public isActive():boolean {