Skip to content

Commit a1920fe

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 62fd7df + 7b0fc2c commit a1920fe

File tree

59 files changed

+97
-61
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

+97
-61
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15786,7 +15786,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
1578615786
templateUrl: 'views/empty-state.html',
1578715787
controller: ["$filter", function ($filter) {
1578815788
'use strict';
15789-
var ctrl = this;
15789+
var ctrl = this, prevConfig;
1579015790

1579115791
ctrl.defaultConfig = {
1579215792
title: 'No Items Available'
@@ -15800,7 +15800,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
1580015800
};
1580115801

1580215802
ctrl.updateConfig = function () {
15803+
prevConfig = angular.copy(ctrl.config);
1580315804
_.defaults(ctrl.config, ctrl.defaultConfig);
15805+
if (ctrl.config.helpLink && angular.isUndefined(ctrl.config.helpLink.url)) {
15806+
// if no url specified, set url to not redirect. ie. just do urlAction
15807+
ctrl.config.helpLink.url = "javascript:void(0)";
15808+
}
1580415809
};
1580515810

1580615811
ctrl.$onChanges = function (changesObj) {
@@ -15809,6 +15814,13 @@ angular.module('patternfly.views').component('pfEmptyState', {
1580915814
}
1581015815
};
1581115816

15817+
ctrl.$doCheck = function () {
15818+
// do a deep compare on config
15819+
if (!angular.equals(ctrl.config, prevConfig)) {
15820+
ctrl.updateConfig();
15821+
}
15822+
};
15823+
1581215824
ctrl.hasMainActions = function () {
1581315825
var mainActions;
1581415826

‎dist/angular-patternfly.min.js‎

Lines changed: 2 additions & 2 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: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15786,7 +15786,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
1578615786
templateUrl: 'views/empty-state.html',
1578715787
controller: ["$filter", function ($filter) {
1578815788
'use strict';
15789-
var ctrl = this;
15789+
var ctrl = this, prevConfig;
1579015790

1579115791
ctrl.defaultConfig = {
1579215792
title: 'No Items Available'
@@ -15800,7 +15800,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
1580015800
};
1580115801

1580215802
ctrl.updateConfig = function () {
15803+
prevConfig = angular.copy(ctrl.config);
1580315804
_.defaults(ctrl.config, ctrl.defaultConfig);
15805+
if (ctrl.config.helpLink && angular.isUndefined(ctrl.config.helpLink.url)) {
15806+
// if no url specified, set url to not redirect. ie. just do urlAction
15807+
ctrl.config.helpLink.url = "javascript:void(0)";
15808+
}
1580415809
};
1580515810

1580615811
ctrl.$onChanges = function (changesObj) {
@@ -15809,6 +15814,13 @@ angular.module('patternfly.views').component('pfEmptyState', {
1580915814
}
1581015815
};
1581115816

15817+
ctrl.$doCheck = function () {
15818+
// do a deep compare on config
15819+
if (!angular.equals(ctrl.config, prevConfig)) {
15820+
ctrl.updateConfig();
15821+
}
15822+
};
15823+
1581215824
ctrl.hasMainActions = function () {
1581315825
var mainActions;
1581415826

‎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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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/c13966c/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/c1594ad/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>

0 commit comments

Comments
 (0)