Skip to content

Commit 0101b68

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 7cf020d + 622b762 commit 0101b68

File tree

54 files changed

+163
-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.

54 files changed

+163
-52
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11358,6 +11358,30 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1135811358
city: "New York",
1135911359
state: "New York"
1136011360
},
11361+
{
11362+
name: "Mike Bird",
11363+
address: "50 Forth Street",
11364+
city: "New York",
11365+
state: "New York"
11366+
},
11367+
{
11368+
name: "Cheryl Taylor",
11369+
address: "2 Main Street",
11370+
city: "New York",
11371+
state: "New York"
11372+
},
11373+
{
11374+
name: "Ren DiLorenzo",
11375+
address: "10 Chase Lane",
11376+
city: "Boston",
11377+
state: "Massacusetts"
11378+
},
11379+
{
11380+
name: "Kim Livingston",
11381+
address: "5 Tree Hill Lane",
11382+
city: "Boston",
11383+
state: "Massacusetts"
11384+
}
1136111385
];
1136211386
resolve(items);
1136311387
}, 10);
@@ -11875,6 +11899,7 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1187511899
destroy: true,
1187611900
order: [[1, "asc"]],
1187711901
dom: "t",
11902+
paging: false,
1187811903
select: {
1187911904
selector: 'td:first-child input[type="checkbox"]',
1188011905
style: 'multi'
@@ -11896,9 +11921,13 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1189611921
if (angular.isDefined(ctrl.colummns) && angular.isUndefined(ctrl.columns)) {
1189711922
ctrl.columns = ctrl.colummns;
1189811923
}
11924+
1189911925
if (angular.isUndefined(ctrl.dtOptions)) {
1190011926
ctrl.dtOptions = {};
11927+
} else if (angular.isDefined(ctrl.dtOptions.paginationType)) {
11928+
ctrl.dtOptions.paging = true;
1190111929
}
11930+
1190211931
if (angular.isUndefined(ctrl.config)) {
1190311932
ctrl.config = {};
1190411933
}

‎dist/angular-patternfly.min.js‎

Lines changed: 3 additions & 3 deletions
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: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11358,6 +11358,30 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1135811358
city: "New York",
1135911359
state: "New York"
1136011360
},
11361+
{
11362+
name: "Mike Bird",
11363+
address: "50 Forth Street",
11364+
city: "New York",
11365+
state: "New York"
11366+
},
11367+
{
11368+
name: "Cheryl Taylor",
11369+
address: "2 Main Street",
11370+
city: "New York",
11371+
state: "New York"
11372+
},
11373+
{
11374+
name: "Ren DiLorenzo",
11375+
address: "10 Chase Lane",
11376+
city: "Boston",
11377+
state: "Massacusetts"
11378+
},
11379+
{
11380+
name: "Kim Livingston",
11381+
address: "5 Tree Hill Lane",
11382+
city: "Boston",
11383+
state: "Massacusetts"
11384+
}
1136111385
];
1136211386
resolve(items);
1136311387
}, 10);
@@ -11875,6 +11899,7 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1187511899
destroy: true,
1187611900
order: [[1, "asc"]],
1187711901
dom: "t",
11902+
paging: false,
1187811903
select: {
1187911904
selector: 'td:first-child input[type="checkbox"]',
1188011905
style: 'multi'
@@ -11896,9 +11921,13 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1189611921
if (angular.isDefined(ctrl.colummns) && angular.isUndefined(ctrl.columns)) {
1189711922
ctrl.columns = ctrl.colummns;
1189811923
}
11924+
1189911925
if (angular.isUndefined(ctrl.dtOptions)) {
1190011926
ctrl.dtOptions = {};
11927+
} else if (angular.isDefined(ctrl.dtOptions.paginationType)) {
11928+
ctrl.dtOptions.paging = true;
1190111929
}
11930+
1190211931
if (angular.isUndefined(ctrl.config)) {
1190311932
ctrl.config = {};
1190411933
}

‎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/4c55581/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/3a2b6f2/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/4c55581/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/3a2b6f2/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/4c55581/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/3a2b6f2/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/4c55581/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/3a2b6f2/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: 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/4c55581/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/3a2b6f2/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.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/4c55581/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/3a2b6f2/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>

0 commit comments

Comments
 (0)