Skip to content

Commit e796c1b

Browse files
jeff-phillips-18jeff-phillips-18
committed
Remove internal usage of pf-select
1 parent 2cf0bfc commit e796c1b

19 files changed

+209
-174
lines changed

‎Gruntfile.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ module.exports = function (grunt) {
250250
files: ['Gruntfile.js'],
251251
tasks: ['eslint']
252252
},
253+
test: {
254+
files: ['test/**/*.js'],
255+
tasks: ['test']
256+
},
253257
all: {
254258
files: ['Gruntfile.js', 'src/**/*.js', 'src/**/*.html', 'styles/**/*.css'],
255259
tasks: ['build'],

‎src/card/basic/card.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<div ng-class="showTopBorder === 'true' ? 'card-pf card-pf-accented' : 'card-pf'">
22
<div ng-if="showHeader()" ng-class="shouldShowTitlesSeparator ? 'card-pf-heading' : 'card-pf-heading-no-bottom'">
3-
<div ng-if="showFilterInHeader()" uib-dropdown class="card-pf-time-frame-filter">
4-
<div ng-include="'card/basic/card-filter.html'"></div>
5-
</div>
3+
<div ng-if="showFilterInHeader()" uib-dropdown class="card-pf-time-frame-filter" ng-include="'card/basic/card-filter.html'"></div>
64
<h2 class="card-pf-title">{{headTitle}}</h2>
75
</div>
86

@@ -12,9 +10,7 @@ <h2 class="card-pf-title">{{headTitle}}</h2>
1210
<div ng-transclude></div>
1311
</div>
1412
<div ng-if="footer" class="card-pf-footer">
15-
<div ng-if="showFilterInFooter()" uib-dropdown class="card-pf-time-frame-filter">
16-
<div ng-include="'card/basic/card-filter.html'"></div>
17-
</div>
13+
<div ng-if="showFilterInFooter()" uib-dropdown class="card-pf-time-frame-filter" ng-include="'card/basic/card-filter.html'"></div>
1814
<p>
1915
<a ng-if="footer.href" href="{{footer.href}}" ng-class="{'card-pf-link-with-icon':footer.iconClass,'card-pf-link':!footer.iconClass}">
2016
<span ng-if="footer.iconClass" class="{{footer.iconClass}} card-pf-footer-text"></span>

‎src/card/card.module.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* Card module for patternfly.
66
*
77
*/
8-
angular.module('patternfly.card', []);
8+
angular.module('patternfly.card', ['ui.bootstrap']);

‎src/charts/trends/trends-chart.directive.js‎

Lines changed: 71 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,39 @@
5959
<form role="form" >
6060
<div class="form-group">
6161
<label>Layout</label></br>
62-
<select pf-select class="pf-select-sm" ng-model="layout" id="layout">
63-
<option value="large" ng-selected="true" selected>Large</option>
64-
<option value="small">Small</option>
65-
<option value="compact">Compact</option>
66-
<option value="inline">Inline</option>
67-
</select>
62+
<div class="btn-group" uib-dropdown>
63+
<button type="button" uib-dropdown-toggle class="btn btn-default">
64+
{{layout.title}}
65+
<span class="caret"></span>
66+
</button>
67+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
68+
<li ng-repeat="item in layouts" ng-class="{'selected': item === layout}">
69+
<a role="menuitem" tabindex="-1" ng-click="updateLayout(item)">
70+
{{item.title}}
71+
</a>
72+
</li>
73+
</ul>
74+
</div>
6875
</div>
6976
</form>
7077
</div>
7178
<div class="col-md-3">
7279
<form role="form" ng-hide="layout == 'inline'">
7380
<div class="form-group">
7481
<label>Title Value Type</label></br>
75-
<select pf-select class="pf-select-sm" ng-model="valueType" id="valueType">
76-
<option value="actual" ng-selected="true" selected>Actual</option>
77-
<option value="percentage">Percentage</option>
78-
</select>
82+
<div class="btn-group" uib-dropdown>
83+
<button type="button" uib-dropdown-toggle class="btn btn-default">
84+
{{valueType.title}}
85+
<span class="caret"></span>
86+
</button>
87+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
88+
<li ng-repeat="item in valueTypes" ng-class="{'selected': item === valueType}">
89+
<a role="menuitem" tabindex="-1" ng-click="updateValueType(item)">
90+
{{item.title}}
91+
</a>
92+
</li>
93+
</ul>
94+
</div>
7995
</div>
8096
</form>
8197
</div>
@@ -98,7 +114,7 @@
98114
</div>
99115
</file>
100116
<file name="script.js">
101-
angular.module( 'demo', ['patternfly.charts', 'patternfly.card'] ).controller( 'ChartCtrl', function( $scope ) {
117+
angular.module( 'demo', ['patternfly.charts', 'patternfly.card', 'ui.bootstrap'] ).controller( 'ChartCtrl', function( $scope ) {
102118
103119
$scope.config = {
104120
chartId : 'exampleTrendsChart',
@@ -128,6 +144,50 @@
128144
}
129145
}
130146
147+
$scope.layouts = [
148+
{
149+
title: "Large",
150+
value: "large"
151+
},
152+
{
153+
title: "Small",
154+
value: "small"
155+
},
156+
{
157+
title: "Compact",
158+
value: "compact"
159+
},
160+
{
161+
title: "Inline",
162+
value: "inline"
163+
}
164+
];
165+
166+
$scope.layout = $scope.layouts[0];
167+
168+
$scope.updateLayout = function(item) {
169+
$scope.layout = item;
170+
$scope.config.layout = item.value;
171+
};
172+
173+
$scope.valueTypes = [
174+
{
175+
title: "Actual",
176+
value: "actual"
177+
},
178+
{
179+
title: "Percentage",
180+
value: "percentage"
181+
}
182+
];
183+
184+
$scope.valueType = $scope.valueTypes[0];
185+
186+
$scope.updateValueType = function(item) {
187+
$scope.valueType = item;
188+
$scope.config.valueType = item.value;
189+
};
190+
131191
var today = new Date();
132192
var dates = ['dates'];
133193
for (var d = 20 - 1; d >= 0; d--) {
@@ -148,15 +208,6 @@
148208
$scope.data.xData.push(new Date($scope.data.xData[$scope.data.xData.length - 1].getTime() + (24 * 60 * 60 * 1000)));
149209
$scope.data.yData.push(Math.round(Math.random() * 100));
150210
};
151-
152-
$scope.$watch('valueType', function (newValue) {
153-
$scope.config.valueType = newValue;
154-
});
155-
156-
$scope.$watch('layout', function (newValue) {
157-
$scope.config.layout = newValue;
158-
});
159-
160211
});
161212
</file>
162213
</example>

‎src/filters/filter-directive.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* </ul>
2323
*
2424
* @example
25-
<example module="patternfly.filters" deps="patternfly.select">
25+
<example module="patternfly.filters">
2626
<file name="index.html">
2727
<div ng-controller="ViewCtrl" class="row example-container">
2828
<div class="col-md-12">

‎src/filters/filter-fields-directive.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ angular.module('patternfly.filters').directive('pfFilterFields', function () {
5656
};
5757

5858
scope.selectValue = function (filterValue) {
59-
scope.addFilterFn(scope.currentField, filterValue);
60-
scope.config.currentValue = null;
59+
if (angular.isDefined(filterValue)) {
60+
scope.addFilterFn(scope.currentField, filterValue);
61+
scope.config.currentValue = null;
62+
}
6163
};
6264

6365
scope.onValueKeyPress = function (keyEvent) {

‎src/filters/filter-fields.html‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,24 @@
1919
ng-keypress="onValueKeyPress($event)"/>
2020
</div>
2121
<div ng-if="currentField.filterType === 'select'">
22-
<select pf-select class="form-control filter-select" id="currentValue"
23-
ng-model="config.currentValue"
24-
ng-options="filterValue for filterValue in currentField.filterValues"
25-
ng-change="selectValue(config.currentValue)">
26-
<option value="">{{currentField.placeholder}}</option>
27-
</select>
22+
<div class="btn-group bootstrap-select form-control filter-select" uib-dropdown >
23+
<button type="button" uib-dropdown-toggle class="btn btn-default dropdown-toggle">
24+
<span class="filter-option pull-left">{{config.currentValue || currentField.placeholder}}</span>
25+
<span class="caret"></span>
26+
</button>
27+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
28+
<li ng-if="currentField.placeholder" ng-class="{'selected': filterValue === '' || filterValue === null || filterValue === undefined}">
29+
<a role="menuitem" tabindex="-1" ng-click="selectValue()">
30+
{{currentField.placeholder}}
31+
</a>
32+
</li>
33+
<li ng-repeat="filterValue in currentField.filterValues" ng-class="{'selected': filterValue === config.currentValue}">
34+
<a role="menuitem" tabindex="-1" ng-click="selectValue(filterValue)">
35+
{{filterValue}}
36+
</a>
37+
</li>
38+
</ul>
39+
</div>
2840
</div>
2941
</div>
3042
</div>

‎src/filters/filters.module.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* Filters module for patternfly.
66
*
77
*/
8-
angular.module('patternfly.filters', ['patternfly.select', 'ui.bootstrap']);
8+
angular.module('patternfly.filters', ['ui.bootstrap']);

‎src/notification/inline-notification.directive.js‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,19 @@
4040
<div class="form-group">
4141
<label class="col-sm-2 control-label" for="type">Type:</label>
4242
<div class="col-sm-10">
43-
<select pf-select ng-model="type" id="type" ng-options="o as o for o in types"></select>
43+
<div class="btn-group" uib-dropdown>
44+
<button type="button" uib-dropdown-toggle class="btn btn-default">
45+
{{type}}
46+
<span class="caret"></span>
47+
</button>
48+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
49+
<li ng-repeat="item in types" ng-class="{'selected': item === type}">
50+
<a role="menuitem" tabindex="-1" ng-click="updateType(item)">
51+
{{item}}
52+
</a>
53+
</li>
54+
</ul>
55+
</div>
4456
</div>
4557
</div>
4658
<div class="form-group">
@@ -59,6 +71,9 @@
5971
$scope.type = $scope.types[0];
6072
$scope.isPersistent = false;
6173
74+
$scope.updateType = function(item) {
75+
$scope.type = item;
76+
};
6277
$scope.header = 'Default Header.';
6378
$scope.message = 'Default Message.';
6479
});

‎src/notification/notification.js‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,19 @@
4646
<div class="form-group">
4747
<label class="col-sm-2 control-label" for="type">Type:</label>
4848
<div class="col-sm-10">
49-
<select pf-select ng-model="type" id="type" ng-options="o as o for o in types"></select>
49+
<div class="btn-group" uib-dropdown>
50+
<button type="button" uib-dropdown-toggle class="btn btn-default">
51+
{{type}}
52+
<span class="caret"></span>
53+
</button>
54+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
55+
<li ng-repeat="item in types" ng-class="{'selected': item === type}">
56+
<a role="menuitem" tabindex="-1" ng-click="updateType(item)">
57+
{{item}}
58+
</a>
59+
</li>
60+
</ul>
61+
</div>
5062
</div>
5163
</div>
5264
<div class="form-group">
@@ -69,6 +81,11 @@
6981
$scope.types = Object.keys(typeMap);
7082
7183
$scope.type = $scope.types[0];
84+
85+
$scope.updateType = function(item) {
86+
$scope.type = item;
87+
};
88+
7289
$scope.message = 'Default notification message.';
7390
7491
$scope.notify = function () {
@@ -225,7 +242,19 @@ angular.module('patternfly.notification').provider('Notifications', function ()
225242
<div class="form-group">
226243
<label class="col-sm-2 control-label" for="type">Type:</label>
227244
<div class="col-sm-10">
228-
<select pf-select ng-model="type" id="type" ng-options="o as o for o in types"></select>
245+
<div class="btn-group" uib-dropdown>
246+
<button type="button" uib-dropdown-toggle class="btn btn-default">
247+
{{type}}
248+
<span class="caret"></span>
249+
</button>
250+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
251+
<li ng-repeat="item in types" ng-class="{'selected': item === type}">
252+
<a role="menuitem" tabindex="-1" ng-click="updateType(item)">
253+
{{item}}
254+
</a>
255+
</li>
256+
</ul>
257+
</div>
229258
</div>
230259
</div>
231260
<div class="form-group">
@@ -257,6 +286,10 @@ angular.module('patternfly.notification').provider('Notifications', function ()
257286
$scope.type = $scope.types[0];
258287
$scope.message = 'Default notification message.';
259288
289+
$scope.updateType = function(item) {
290+
$scope.type = item;
291+
};
292+
260293
$scope.notify = function () {
261294
typeMap[$scope.type]($scope.message);
262295
}

0 commit comments

Comments
 (0)