Skip to content

Commit 8152798

Browse files
Merge branch 'master-local' into master-dist
2 parents c41efc2 + 46552e7 commit 8152798

File tree

58 files changed

+151
-54
lines changed

Some content is hidden

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

58 files changed

+151
-54
lines changed

dist/angular-patternfly.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,6 +3245,8 @@ angular.module('patternfly.card').component('pfCard', {
32453245
* {label:'Today', value:'today'}]</pre>
32463246
* <li>.defaultFilter - integer, 0 based index into the filters array
32473247
* <li>.callBackFn - user defined function to call when a filter is selected
3248+
* <li>.position - (optional) If not specified, or set to 'footer'; the position of the filter dropdown will appear in the
3249+
* card footer. If set to 'header', the filter dropdown will appear in the card header.
32483250
* </ul>
32493251
* @description
32503252
* Component for easily displaying a card with html content
@@ -16813,6 +16815,25 @@ angular.module('patternfly.views').component('pfEmptyState', {
1681316815
;(function () {
1681416816
'use strict';
1681516817

16818+
/**
16819+
* @ngdoc object
16820+
* @name patternfly.views.pfViewUtils
16821+
* @description
16822+
* A utility constant to return view objects used for Dashboard, Card, Table, List, and Topology view switcher types.
16823+
* @example
16824+
* <pre>
16825+
* $scope.viewsConfig = {
16826+
* views: [pfViewUtils.getListView(), pfViewUtils.getCardView(), pfViewUtils.getTableView()]
16827+
* };
16828+
* </pre>
16829+
* Each getXxxxView() returns an object:
16830+
* <ul style='list-style-type: none'>
16831+
* <li>.id - (String) Unique id for the view, used for comparisons
16832+
* <li>.title - (String) Optional title, uses as a tooltip for the view selector
16833+
* <li>.iconClass - (String) Icon class to use for the view selector
16834+
* </ul>
16835+
* Please see {@link patternfly.toolbars.component:pfToolbar pfToolbar} for use in Toolbar View Switcher
16836+
*/
1681616837
angular.module('patternfly.views').constant('pfViewUtils', {
1681716838
getDashboardView: function (title) {
1681816839
return {

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,6 +3245,8 @@ angular.module('patternfly.card').component('pfCard', {
32453245
* {label:'Today', value:'today'}]</pre>
32463246
* <li>.defaultFilter - integer, 0 based index into the filters array
32473247
* <li>.callBackFn - user defined function to call when a filter is selected
3248+
* <li>.position - (optional) If not specified, or set to 'footer'; the position of the filter dropdown will appear in the
3249+
* card footer. If set to 'header', the filter dropdown will appear in the card header.
32483250
* </ul>
32493251
* @description
32503252
* Component for easily displaying a card with html content
@@ -16813,6 +16815,25 @@ angular.module('patternfly.views').component('pfEmptyState', {
1681316815
;(function () {
1681416816
'use strict';
1681516817

16818+
/**
16819+
* @ngdoc object
16820+
* @name patternfly.views.pfViewUtils
16821+
* @description
16822+
* A utility constant to return view objects used for Dashboard, Card, Table, List, and Topology view switcher types.
16823+
* @example
16824+
* <pre>
16825+
* $scope.viewsConfig = {
16826+
* views: [pfViewUtils.getListView(), pfViewUtils.getCardView(), pfViewUtils.getTableView()]
16827+
* };
16828+
* </pre>
16829+
* Each getXxxxView() returns an object:
16830+
* <ul style='list-style-type: none'>
16831+
* <li>.id - (String) Unique id for the view, used for comparisons
16832+
* <li>.title - (String) Optional title, uses as a tooltip for the view selector
16833+
* <li>.iconClass - (String) Icon class to use for the view selector
16834+
* </ul>
16835+
* Please see {@link patternfly.toolbars.component:pfToolbar pfToolbar} for use in Toolbar View Switcher
16836+
*/
1681616837
angular.module('patternfly.views').constant('pfViewUtils', {
1681716838
getDashboardView: function (title) {
1681816839
return {

dist/docs/js/docs-setup.js

Lines changed: 10 additions & 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/7416fa4/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/ccc746f/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.directive.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/7416fa4/src/canvas-view/examples/canvas.js#L329" 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/ccc746f/src/canvas-view/examples/canvas.js#L329" 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.directive.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/7416fa4/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/ccc746f/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/7416fa4/src/card/aggregate-status/aggregate-status-card.component.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.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/ccc746f/src/card/aggregate-status/aggregate-status-card.component.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.component.pfCard - Timeframe Filters.html

Lines changed: 3 additions & 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/7416fa4/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/ccc746f/src/card/examples/card-timeframe.js#L84" 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>
@@ -37,6 +37,8 @@ <h4 id="usage_parameters">Parameters</h4><table class="variables-matrix table ta
3737
{label:'Today', value:'today'}]</pre>
3838
<li>.defaultFilter - integer, 0 based index into the filters array
3939
<li>.callBackFn - user defined function to call when a filter is selected
40+
<li>.position - (optional) If not specified, or set to &#39;footer&#39;; the position of the filter dropdown will appear in the
41+
card footer. If set to &#39;header&#39;, the filter dropdown will appear in the card header.
4042
</ul></div></td></tr></tbody></table></div>
4143
<h2 id="example">Example</h2>
4244
<div class="example"><div class="patternfly-card-component-page patternfly-card-component-pfcard-timeframe-filters-page"><h4 id="example_source">Source</h4>

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/7416fa4/src/card/examples/card-trend.js#L159" 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/ccc746f/src/card/examples/card-trend.js#L159" 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/7416fa4/src/card/basic/card.component.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.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/ccc746f/src/card/basic/card.component.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>

0 commit comments

Comments
 (0)