Skip to content

Commit

Permalink
Merge branch 'master-local' into master-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
patternfly-build committed Dec 8, 2017
2 parents 9c8a0b6 + 9697aad commit 68929e5
Show file tree
Hide file tree
Showing 60 changed files with 118 additions and 100 deletions.
33 changes: 19 additions & 14 deletions dist/angular-patternfly.js
Original file line number Diff line number Diff line change
Expand Up @@ -17273,7 +17273,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
</file>
<file name="wizard-container.html">
<pf-wizard wizard-title="Wizard Title"
wizard-ready="deployProviderReady"
wizard-ready="wizardReady"
on-finish="finishedWizard()"
on-cancel="cancelDeploymentWizard()"
next-title="nextButtonTitle"
Expand Down Expand Up @@ -17419,9 +17419,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
ipsum: ''
};
$scope.secondaryLoadInformation = 'ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet.';

$scope.wizardReady = false;
$timeout(function () {
$scope.deployReady = true;
$scope.wizardReady = true;
}, 1000);

$scope.nextButtonTitle = "Next >";
};

Expand Down Expand Up @@ -18154,27 +18157,27 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
bindings: {
title: '@',
wizardTitle: '@',
hideIndicators: '=?',
hideIndicators: '<?',
activeStepTitleOnly: '<?',
hideSidebar: '@',
hideHeader: '@',
hideBackButton: '@',
sidebarClass: '@',
stepClass: '@',
contentHeight: '=?',
contentHeight: '<?',
currentStep: '<?',
cancelTitle: '=?',
backTitle: '=?',
nextTitle: '=?',
backCallback: '=?',
nextCallback: '=?',
cancelTitle: '<?',
backTitle: '<?',
nextTitle: '<?',
backCallback: '<?',
nextCallback: '<?',
onFinish: '&',
onCancel: '&',
wizardReady: '=?',
wizardDone: '=?',
loadingWizardTitle: '=?',
loadingSecondaryInformation: '=?',
embedInPage: '=?',
wizardReady: '<?',
wizardDone: '<?',
loadingWizardTitle: '<?',
loadingSecondaryInformation: '<?',
embedInPage: '<?',
onStepChanged: '&?'
},
templateUrl: 'wizard/wizard.html',
Expand Down Expand Up @@ -18359,13 +18362,15 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
ctrl.allowStepIndicatorClick = function (step) {
return step.allowClickNav &&
!ctrl.wizardDone &&
ctrl.selectedStep &&
ctrl.selectedStep.okToNavAway &&
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
(ctrl.selectedStep.prevEnabled || (step.stepPriority > ctrl.selectedStep.stepPriority));
};

ctrl.stepClick = function (step) {
if (step.allowClickNav &&
ctrl.selectedStep &&
!ctrl.wizardDone &&
ctrl.selectedStep.okToNavAway &&
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-patternfly.min.js

Large diffs are not rendered by default.

33 changes: 19 additions & 14 deletions dist/docs/grunt-scripts/angular-patternfly.js
Original file line number Diff line number Diff line change
Expand Up @@ -17273,7 +17273,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
</file>
<file name="wizard-container.html">
<pf-wizard wizard-title="Wizard Title"
wizard-ready="deployProviderReady"
wizard-ready="wizardReady"
on-finish="finishedWizard()"
on-cancel="cancelDeploymentWizard()"
next-title="nextButtonTitle"
Expand Down Expand Up @@ -17419,9 +17419,12 @@ angular.module('patternfly.views').component('pfEmptyState', {
ipsum: ''
};
$scope.secondaryLoadInformation = 'ipsum dolor sit amet, porta at suspendisse ac, ut wisi vivamus, lorem sociosqu eget nunc amet.';

$scope.wizardReady = false;
$timeout(function () {
$scope.deployReady = true;
$scope.wizardReady = true;
}, 1000);

$scope.nextButtonTitle = "Next >";
};

Expand Down Expand Up @@ -18154,27 +18157,27 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
bindings: {
title: '@',
wizardTitle: '@',
hideIndicators: '=?',
hideIndicators: '<?',
activeStepTitleOnly: '<?',
hideSidebar: '@',
hideHeader: '@',
hideBackButton: '@',
sidebarClass: '@',
stepClass: '@',
contentHeight: '=?',
contentHeight: '<?',
currentStep: '<?',
cancelTitle: '=?',
backTitle: '=?',
nextTitle: '=?',
backCallback: '=?',
nextCallback: '=?',
cancelTitle: '<?',
backTitle: '<?',
nextTitle: '<?',
backCallback: '<?',
nextCallback: '<?',
onFinish: '&',
onCancel: '&',
wizardReady: '=?',
wizardDone: '=?',
loadingWizardTitle: '=?',
loadingSecondaryInformation: '=?',
embedInPage: '=?',
wizardReady: '<?',
wizardDone: '<?',
loadingWizardTitle: '<?',
loadingSecondaryInformation: '<?',
embedInPage: '<?',
onStepChanged: '&?'
},
templateUrl: 'wizard/wizard.html',
Expand Down Expand Up @@ -18359,13 +18362,15 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
ctrl.allowStepIndicatorClick = function (step) {
return step.allowClickNav &&
!ctrl.wizardDone &&
ctrl.selectedStep &&
ctrl.selectedStep.okToNavAway &&
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
(ctrl.selectedStep.prevEnabled || (step.stepPriority > ctrl.selectedStep.stepPriority));
};

ctrl.stepClick = function (step) {
if (step.allowClickNav &&
ctrl.selectedStep &&
!ctrl.wizardDone &&
ctrl.selectedStep.okToNavAway &&
(ctrl.selectedStep.nextEnabled || (step.stepPriority < ctrl.selectedStep.stepPriority)) &&
Expand Down
2 changes: 1 addition & 1 deletion dist/docs/js/docs-setup.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/docs/partials/api/patternfly.autofocus.pfFocused.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.canvas</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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>
<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>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.card</code>
</span>
</div>
Expand Down
Loading

0 comments on commit 68929e5

Please sign in to comment.