Skip to content

Commit c99be9a

Browse files
Merge branch 'master-local' into master-dist
2 parents 3898eeb + a4366b8 commit c99be9a

File tree

59 files changed

+117
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+117
-69
lines changed

dist/angular-patternfly.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7598,14 +7598,26 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
75987598

75997599
$scope.onKeywordKeyPress = function(keyEvent) {
76007600
if (keyEvent.which === 13 && $scope.filterPanelModel[0].value.length > 0) {
7601-
// store new keywoard filter value in values array
7602-
$scope.filterPanelModel[0].values.push($scope.filterPanelModel[0].value);
7601+
var currentKeyword = $scope.filterPanelModel[0].value;
7602+
if(!keywordFilterExists(currentKeyword)) {
7603+
// store new keywoard filter value in values array
7604+
$scope.filterPanelModel[0].values.push(currentKeyword);
7605+
applyFilters();
7606+
}
76037607
// remove the keyword value to show placeholder text
76047608
delete $scope.filterPanelModel[0].value;
7605-
applyFilters();
76067609
}
76077610
};
76087611

7612+
var keywordFilterExists = function (keyword) {
7613+
return _.some( $scope.filterPanelModel[0].values, function(existingKeyword) {
7614+
// case sensitive
7615+
// return keyword === existingKeyword;
7616+
// case insensitive:
7617+
return keyword.toLowerCase() === existingKeyword.toLowerCase();
7618+
});
7619+
}
7620+
76097621
var applyFilters = function () {
76107622
var newAppliedFilters = [];
76117623
_.forEach($scope.filterPanelModel, function(filter) {

dist/docs/grunt-scripts/angular-patternfly.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7598,14 +7598,26 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
75987598

75997599
$scope.onKeywordKeyPress = function(keyEvent) {
76007600
if (keyEvent.which === 13 && $scope.filterPanelModel[0].value.length > 0) {
7601-
// store new keywoard filter value in values array
7602-
$scope.filterPanelModel[0].values.push($scope.filterPanelModel[0].value);
7601+
var currentKeyword = $scope.filterPanelModel[0].value;
7602+
if(!keywordFilterExists(currentKeyword)) {
7603+
// store new keywoard filter value in values array
7604+
$scope.filterPanelModel[0].values.push(currentKeyword);
7605+
applyFilters();
7606+
}
76037607
// remove the keyword value to show placeholder text
76047608
delete $scope.filterPanelModel[0].value;
7605-
applyFilters();
76067609
}
76077610
};
76087611

7612+
var keywordFilterExists = function (keyword) {
7613+
return _.some( $scope.filterPanelModel[0].values, function(existingKeyword) {
7614+
// case sensitive
7615+
// return keyword === existingKeyword;
7616+
// case insensitive:
7617+
return keyword.toLowerCase() === existingKeyword.toLowerCase();
7618+
});
7619+
}
7620+
76097621
var applyFilters = function () {
76107622
var newAppliedFilters = [];
76117623
_.forEach($scope.filterPanelModel, function(filter) {

dist/docs/js/docs-setup.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/partials/api/patternfly.autofocus.pfFocused.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/autofocus/autofocus.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/autofocus/autofocus.js#L39" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfFocused</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.canvas.component.pfCanvas.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/canvas-view/examples/canvas.js#L335" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvas.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/canvas-view/examples/canvas.js#L335" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvas</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.canvas.component.pfCanvasEditor.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/canvas-view/examples/canvasEditor.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/canvas-view/examples/canvasEditor.js#L344" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCanvasEditor</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.component.pfAggregateStatusCard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/card/aggregate-status/aggregate-status-card.component.js#L205" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/aggregate-status/aggregate-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/card/aggregate-status/aggregate-status-card.component.js#L205" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfAggregateStatusCard</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.component.pfCard - Timeframe Filters.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/card/examples/card-timeframe.js#L96" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-timeframe.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/card/examples/card-timeframe.js#L96" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Timeframe Filters</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.component.pfCard - Trends.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/card/examples/card-trend.js#L167" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/examples/card-trend.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/card/examples/card-trend.js#L167" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Trends</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.component.pfCard - Utilization.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/basic/card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/card/basic/card.component.js#L95" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/basic/card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/card/basic/card.component.js#L95" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfCard - Utilization</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.card.component.pfInfoStatusCard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/info-status/info-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/card/info-status/info-status-card.component.js#L116" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfInfoStatusCard</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/card/info-status/info-status-card.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/card/info-status/info-status-card.component.js#L116" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfInfoStatusCard</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfC3Chart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfDonutChart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/examples/donut-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/donut/examples/donut-chart.js#L94" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutChart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/examples/donut-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/donut/examples/donut-chart.js#L94" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutChart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfDonutPctChart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/examples/donut-pct-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/donut/examples/donut-pct-chart.js#L403" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutPctChart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/examples/donut-pct-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/donut/examples/donut-pct-chart.js#L403" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutPctChart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfLineChart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/line/line-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/line/line-chart.component.js#L129" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfLineChart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/line/line-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/line/line-chart.component.js#L129" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfLineChart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfSparklineChart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/sparkline/sparkline-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/sparkline/sparkline-chart.component.js#L147" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfSparklineChart</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/sparkline/sparkline-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/sparkline/sparkline-chart.component.js#L147" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfSparklineChart</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.component.pfTopology.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/topology/examples/topology-view.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/topology/examples/topology-view.js#L315" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfTopology</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/topology/examples/topology-view.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/topology/examples/topology-view.js#L315" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfTopology</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

dist/docs/partials/api/patternfly.charts.directive.pfHeatMap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/heatmap/heatmap.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/f2d388b/src/charts/heatmap/heatmap.component.js#L146" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfHeatMap</code>
1+
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/heatmap/heatmap.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cc7e9f8/src/charts/heatmap/heatmap.component.js#L146" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfHeatMap</code>
22
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
33
</span>
44
</div>

0 commit comments

Comments
 (0)