Skip to content

Commit 75e1c97

Browse files
Merge branch 'master-local' into master-dist
2 parents 6d8c14d + 5d2a537 commit 75e1c97

File tree

48 files changed

+80
-52
lines changed

Some content is hidden

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

48 files changed

+80
-52
lines changed

dist/angular-patternfly.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8256,7 +8256,7 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
82568256
* <li>.onCheckBoxChange - ( function(item) ) Called to notify when a checkbox selection changes, default is none
82578257
* <li>.onSelect - ( function(item, event) ) Called to notify of item selection, default is none
82588258
* <li>.onSelectionChange - ( function(items) ) Called to notify when item selections change, default is none
8259-
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none
8259+
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none. Note: row expansion is the default behavior after onClick performed, but user can stop such default behavior by adding the sentence "return false;" to the end of onClick function body
82608260
* <li>.onDblClick - ( function(item, event) ) Called to notify when an item is double clicked, default is none
82618261
* </ul>
82628262
* @param {array} actionButtons List of action buttons in each row
@@ -8807,6 +8807,7 @@ angular.module('patternfly.views').directive('pfListView', ["$window", "pfUtils"
88078807
var alreadySelected;
88088808
var selectionChanged = false;
88098809
var continueEvent = true;
8810+
var enableRowExpansion = scope.config && scope.config.useExpandingRows && item && !item.disableRowExpansion;
88108811

88118812
// Ignore disabled item clicks completely
88128813
if (scope.checkDisabled(item)) {
@@ -8849,7 +8850,11 @@ angular.module('patternfly.views').directive('pfListView', ["$window", "pfUtils"
88498850
}
88508851
}
88518852
if (scope.config.onClick) {
8852-
scope.config.onClick(item, e);
8853+
if (scope.config.onClick(item, e) !== false && enableRowExpansion) {
8854+
scope.toggleItemExpansion(item);
8855+
}
8856+
} else if (enableRowExpansion) {
8857+
scope.toggleItemExpansion(item);
88538858
}
88548859

88558860
return continueEvent;

dist/angular-patternfly.min.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/grunt-scripts/angular-patternfly.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8256,7 +8256,7 @@ angular.module('patternfly.views').directive('pfCardView', ["pfUtils", function
82568256
* <li>.onCheckBoxChange - ( function(item) ) Called to notify when a checkbox selection changes, default is none
82578257
* <li>.onSelect - ( function(item, event) ) Called to notify of item selection, default is none
82588258
* <li>.onSelectionChange - ( function(items) ) Called to notify when item selections change, default is none
8259-
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none
8259+
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none. Note: row expansion is the default behavior after onClick performed, but user can stop such default behavior by adding the sentence "return false;" to the end of onClick function body
82608260
* <li>.onDblClick - ( function(item, event) ) Called to notify when an item is double clicked, default is none
82618261
* </ul>
82628262
* @param {array} actionButtons List of action buttons in each row
@@ -8807,6 +8807,7 @@ angular.module('patternfly.views').directive('pfListView', ["$window", "pfUtils"
88078807
var alreadySelected;
88088808
var selectionChanged = false;
88098809
var continueEvent = true;
8810+
var enableRowExpansion = scope.config && scope.config.useExpandingRows && item && !item.disableRowExpansion;
88108811

88118812
// Ignore disabled item clicks completely
88128813
if (scope.checkDisabled(item)) {
@@ -8849,7 +8850,11 @@ angular.module('patternfly.views').directive('pfListView', ["$window", "pfUtils"
88498850
}
88508851
}
88518852
if (scope.config.onClick) {
8852-
scope.config.onClick(item, e);
8853+
if (scope.config.onClick(item, e) !== false && enableRowExpansion) {
8854+
scope.toggleItemExpansion(item);
8855+
}
8856+
} else if (enableRowExpansion) {
8857+
scope.toggleItemExpansion(item);
88538858
}
88548859

88558860
return continueEvent;

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/aeecfe2/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/cd75239/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.card.directive.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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/aeecfe2/src/card/aggregate-status/aggregate-status-card.directive.js#L132" 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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cd75239/src/card/aggregate-status/aggregate-status-card.directive.js#L132" 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.directive.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/aeecfe2/src/card/examples/card-timeframe.js#L82" 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/cd75239/src/card/examples/card-timeframe.js#L82" 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.directive.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/aeecfe2/src/card/examples/card-trend.js#L146" 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/cd75239/src/card/examples/card-trend.js#L146" 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.directive.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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/aeecfe2/src/card/basic/card.directive.js#L86" 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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cd75239/src/card/basic/card.directive.js#L86" 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.charts.directive.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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/aeecfe2/src/charts/c3/c3-chart.directive.js#L75" 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.directive.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/cd75239/src/charts/c3/c3-chart.directive.js#L75" 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>

0 commit comments

Comments
 (0)