Skip to content

Commit 68929e5

Browse files
Merge branch 'master-local' into master-dist
2 parents 9c8a0b6 + 9697aad commit 68929e5

File tree

60 files changed

+118
-100
lines changed

Some content is hidden

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

60 files changed

+118
-100
lines changed

dist/angular-patternfly.js

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17273,7 +17273,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
1727317273
</file>
1727417274
<file name="wizard-container.html">
1727517275
<pf-wizard wizard-title="Wizard Title"
17276-
wizard-ready="deployProviderReady"
17276+
wizard-ready="wizardReady"
1727717277
on-finish="finishedWizard()"
1727817278
on-cancel="cancelDeploymentWizard()"
1727917279
next-title="nextButtonTitle"
@@ -17419,9 +17419,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
1741917419
ipsum: ''
1742017420
};
1742117421
$scope.secondaryLoadInformation = 'ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet.';
17422+
17423+
$scope.wizardReady = false;
1742217424
$timeout(function () {
17423-
$scope.deployReady = true;
17425+
$scope.wizardReady = true;
1742417426
}, 1000);
17427+
1742517428
$scope.nextButtonTitle = "Next >";
1742617429
};
1742717430

@@ -18154,27 +18157,27 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1815418157
bindings: {
1815518158
title: '@',
1815618159
wizardTitle: '@',
18157-
hideIndicators: '=?',
18160+
hideIndicators: '<?',
1815818161
activeStepTitleOnly: '<?',
1815918162
hideSidebar: '@',
1816018163
hideHeader: '@',
1816118164
hideBackButton: '@',
1816218165
sidebarClass: '@',
1816318166
stepClass: '@',
18164-
contentHeight: '=?',
18167+
contentHeight: '<?',
1816518168
currentStep: '<?',
18166-
cancelTitle: '=?',
18167-
backTitle: '=?',
18168-
nextTitle: '=?',
18169-
backCallback: '=?',
18170-
nextCallback: '=?',
18169+
cancelTitle: '<?',
18170+
backTitle: '<?',
18171+
nextTitle: '<?',
18172+
backCallback: '<?',
18173+
nextCallback: '<?',
1817118174
onFinish: '&',
1817218175
onCancel: '&',
18173-
wizardReady: '=?',
18174-
wizardDone: '=?',
18175-
loadingWizardTitle: '=?',
18176-
loadingSecondaryInformation: '=?',
18177-
embedInPage: '=?',
18176+
wizardReady: '<?',
18177+
wizardDone: '<?',
18178+
loadingWizardTitle: '<?',
18179+
loadingSecondaryInformation: '<?',
18180+
embedInPage: '<?',
1817818181
onStepChanged: '&?'
1817918182
},
1818018183
templateUrl: 'wizard/wizard.html',
@@ -18359,13 +18362,15 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1835918362
ctrl.allowStepIndicatorClick = function (step) {
1836018363
return step.allowClickNav &&
1836118364
!ctrl.wizardDone &&
18365+
ctrl.selectedStep &&
1836218366
ctrl.selectedStep.okToNavAway &&
1836318367
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
1836418368
(ctrl.selectedStep.prevEnabled || (step.stepPriority > ctrl.selectedStep.stepPriority));
1836518369
};
1836618370

1836718371
ctrl.stepClick = function (step) {
1836818372
if (step.allowClickNav &&
18373+
ctrl.selectedStep &&
1836918374
!ctrl.wizardDone &&
1837018375
ctrl.selectedStep.okToNavAway &&
1837118376
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&

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: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17273,7 +17273,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
1727317273
</file>
1727417274
<file name="wizard-container.html">
1727517275
<pf-wizard wizard-title="Wizard Title"
17276-
wizard-ready="deployProviderReady"
17276+
wizard-ready="wizardReady"
1727717277
on-finish="finishedWizard()"
1727817278
on-cancel="cancelDeploymentWizard()"
1727917279
next-title="nextButtonTitle"
@@ -17419,9 +17419,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
1741917419
ipsum: ''
1742017420
};
1742117421
$scope.secondaryLoadInformation = 'ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet.';
17422+
17423+
$scope.wizardReady = false;
1742217424
$timeout(function () {
17423-
$scope.deployReady = true;
17425+
$scope.wizardReady = true;
1742417426
}, 1000);
17427+
1742517428
$scope.nextButtonTitle = "Next >";
1742617429
};
1742717430

@@ -18154,27 +18157,27 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1815418157
bindings: {
1815518158
title: '@',
1815618159
wizardTitle: '@',
18157-
hideIndicators: '=?',
18160+
hideIndicators: '<?',
1815818161
activeStepTitleOnly: '<?',
1815918162
hideSidebar: '@',
1816018163
hideHeader: '@',
1816118164
hideBackButton: '@',
1816218165
sidebarClass: '@',
1816318166
stepClass: '@',
18164-
contentHeight: '=?',
18167+
contentHeight: '<?',
1816518168
currentStep: '<?',
18166-
cancelTitle: '=?',
18167-
backTitle: '=?',
18168-
nextTitle: '=?',
18169-
backCallback: '=?',
18170-
nextCallback: '=?',
18169+
cancelTitle: '<?',
18170+
backTitle: '<?',
18171+
nextTitle: '<?',
18172+
backCallback: '<?',
18173+
nextCallback: '<?',
1817118174
onFinish: '&',
1817218175
onCancel: '&',
18173-
wizardReady: '=?',
18174-
wizardDone: '=?',
18175-
loadingWizardTitle: '=?',
18176-
loadingSecondaryInformation: '=?',
18177-
embedInPage: '=?',
18176+
wizardReady: '<?',
18177+
wizardDone: '<?',
18178+
loadingWizardTitle: '<?',
18179+
loadingSecondaryInformation: '<?',
18180+
embedInPage: '<?',
1817818181
onStepChanged: '&?'
1817918182
},
1818018183
templateUrl: 'wizard/wizard.html',
@@ -18359,13 +18362,15 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
1835918362
ctrl.allowStepIndicatorClick = function (step) {
1836018363
return step.allowClickNav &&
1836118364
!ctrl.wizardDone &&
18365+
ctrl.selectedStep &&
1836218366
ctrl.selectedStep.okToNavAway &&
1836318367
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
1836418368
(ctrl.selectedStep.prevEnabled || (step.stepPriority > ctrl.selectedStep.stepPriority));
1836518369
};
1836618370

1836718371
ctrl.stepClick = function (step) {
1836818372
if (step.allowClickNav &&
18373+
ctrl.selectedStep &&
1836918374
!ctrl.wizardDone &&
1837018375
ctrl.selectedStep.okToNavAway &&
1837118376
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&

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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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/69148ef/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/a50b9be/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>

0 commit comments

Comments
 (0)