Skip to content

Commit 7cd3aff

Browse files
committed
PTNFLY_2035 Consolidate angular-patternfly dependency management on npm.
1 parent 2bcc83e commit 7cd3aff

File tree

6 files changed

+145
-112
lines changed

6 files changed

+145
-112
lines changed

Gruntfile.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ module.exports = function (grunt) {
5454
},
5555
copy: {
5656
docdata: {
57-
cwd: 'lib/patternfly/dist',
57+
cwd: 'node_modules/patternfly/dist',
5858
src: ['fonts/*', 'img/*'],
5959
dest: 'docs',
6060
expand: true
6161
},
6262
fa: {
63-
cwd: 'lib/patternfly/',
63+
cwd: 'node_modules/patternfly/',
6464
src: ['components/font-awesome/**'],
6565
dest: 'docs',
6666
expand: true
@@ -125,21 +125,21 @@ module.exports = function (grunt) {
125125
dest: 'docs',
126126
image: 'misc/logo-alt.svg',
127127
scripts: [
128-
'lib/moment/moment.js',
129-
'lib/c3/c3.js',
130-
'lib/d3/d3.js',
131-
'lib/patternfly/dist/js/patternfly-settings.js',
132-
'lib/angular/angular.js',
133-
'lib/angular-sanitize/angular-sanitize.js',
134-
'lib/angular-animate/angular-animate.js',
135-
'lib/angular-bootstrap/ui-bootstrap-tpls.js',
128+
'node_modules/moment/moment.js',
129+
'node_modules/c3/c3.js',
130+
'node_modules/d3/d3.js',
131+
'node_modules/patternfly/dist/js/patternfly-settings.js',
132+
'node_modules/angular/angular.js',
133+
'node_modules/angular-sanitize/angular-sanitize.js',
134+
'node_modules/angular-animate/angular-animate.js',
135+
'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js',
136136
'misc/angular-bootstrap-prettify.js',
137-
'lib/lodash/dist/lodash.min.js',
137+
'node_modules/lodash/lodash.min.js',
138138
'dist/angular-patternfly.js',
139-
'lib/angular-ui-router/release/angular-ui-router.min.js'],
139+
'node_modules/angular-ui-router/release/angular-ui-router.min.js'],
140140
html5Mode: false,
141141
template: 'grunt-ngdocs-index.tmpl',
142-
styles: ['lib/patternfly/dist/css/patternfly.css', 'lib/patternfly/dist/css/patternfly-additions.css',
142+
styles: ['node_modules/patternfly/dist/css/patternfly.css', 'node_modules/patternfly/dist/css/patternfly-additions.css',
143143
'dist/styles/angular-patternfly.css', 'misc/ng-docs.css', 'misc/examples.css']
144144
},
145145

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.15.0",
3+
"version": "3.16.0",
44
"authors": [
55
"Red Hat"
66
],

npm-shrinkwrap.json

Lines changed: 105 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Red Hat",
33
"name": "angular-patternfly",
4-
"version": "3.15.0",
4+
"version": "3.16.0",
55
"license": "Apache-2.0",
66
"description": "Angular extension of the PatternFly project.",
77
"keywords": ["angular", "patternfly"],
@@ -12,10 +12,12 @@
1212
"angular-animate": "1.5.*",
1313
"angular-sanitize": "1.5.*",
1414
"angular-ui-bootstrap": "2.3.x",
15-
"lodash": "4.x",
16-
"patternfly": "~3.15.0"
15+
"lodash-amd": "4.x",
16+
"patternfly": "~3.16.0"
1717
},
1818
"devDependencies": {
19+
"angular-mocks": "1.3.0 - 1.5.*",
20+
"angular-ui-router": "^0.3.2",
1921
"express": "3.4.4",
2022
"grunt": "0.4.5",
2123
"grunt-angular-templates": "0.5.7",
@@ -44,6 +46,13 @@
4446
"matchdep": "0.3.0",
4547
"nsp": "^2.6.1"
4648
},
49+
"optionalDependencies": {
50+
"bootstrap-select": "~1.10.0",
51+
"c3": "~0.4.11",
52+
"d3": "~3.5.17",
53+
"jquery": "~2.1.4",
54+
"moment": "~2.14.1"
55+
},
4756
"scripts": {
4857
"test": "grunt test"
4958
},

src/filters/filter-directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ angular.module('patternfly.filters').directive('pfFilter', function () {
184184
};
185185

186186
$scope.enforceSingleSelect = function (filter) {
187-
_.remove($scope.config.appliedFilters, {title: filter.title});
187+
$scope.config.appliedFilters = _.filter($scope.config.appliedFilters, {title: filter.title});
188188
};
189189

190190
$scope.addFilter = function (field, value) {

0 commit comments

Comments
 (0)