Skip to content

Commit 090cdd7

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 061450d + 6691304 commit 090cdd7

File tree

55 files changed

+368
-176
lines changed

Some content is hidden

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

55 files changed

+368
-176
lines changed

‎dist/angular-patternfly.js‎

Lines changed: 103 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15933,51 +15933,115 @@ angular.module('patternfly.views').component('pfEmptyState', {
1593315933
})();
1593415934
;(function () {
1593515935
'use strict';
15936-
function pfWizardButtonComponent (action) {
15937-
angular.module('patternfly.wizard')
15938-
.component(action, {
15939-
bindings: {
15940-
callback: "=?"
15941-
},
15942-
controller: function ($element, $scope) {
15943-
var ctrl = this;
15944-
15945-
var findWizard = function (scope) {
15946-
var wizard;
1594715936

15948-
if (scope) {
15949-
if (angular.isDefined(scope.wizard)) {
15950-
wizard = scope.wizard;
15951-
} else {
15952-
wizard = findWizard(scope.$parent);
15953-
}
15954-
}
15937+
var findWizard = function (scope) {
15938+
var wizard;
1595515939

15956-
return wizard;
15957-
};
15940+
if (scope) {
15941+
if (angular.isDefined(scope.wizard)) {
15942+
wizard = scope.wizard;
15943+
} else {
15944+
wizard = findWizard(scope.$parent);
15945+
}
15946+
}
1595815947

15959-
ctrl.$onInit = function () {
15960-
$scope.wizard = findWizard($scope);
15961-
};
15948+
return wizard;
15949+
};
1596215950

15963-
ctrl.$postLink = function () {
15964-
$element.on("click", function (e) {
15965-
e.preventDefault();
15966-
$scope.$apply(function () {
15967-
// scope apply in button module
15968-
$scope.wizard[action.replace("pfWiz", "").toLowerCase()](ctrl.callback);
15969-
});
15970-
});
15971-
};
15972-
}
15951+
var setupCallback = function (scope, button, fnName, callback) {
15952+
button.on("click", function (e) {
15953+
e.preventDefault();
15954+
scope.$apply(function () {
15955+
// scope apply in button module
15956+
scope.wizard[fnName](callback);
1597315957
});
15974-
}
15958+
});
15959+
};
15960+
15961+
angular.module('patternfly.wizard').component('pfWizNext', {
15962+
bindings: {
15963+
callback: "=?"
15964+
},
15965+
controller: ["$element", "$scope", function ($element, $scope) {
15966+
var ctrl = this;
15967+
15968+
ctrl.$onInit = function () {
15969+
$scope.wizard = findWizard($scope);
15970+
};
15971+
15972+
ctrl.$postLink = function () {
15973+
setupCallback($scope, $element, 'next', ctrl.callback);
15974+
};
15975+
}]
15976+
});
15977+
15978+
angular.module('patternfly.wizard').component('pfWizPrevious', {
15979+
bindings: {
15980+
callback: "=?"
15981+
},
15982+
controller: ["$element", "$scope", function ($element, $scope) {
15983+
var ctrl = this;
15984+
15985+
ctrl.$onInit = function () {
15986+
$scope.wizard = findWizard($scope);
15987+
};
1597515988

15976-
pfWizardButtonComponent('pfWizNext');
15977-
pfWizardButtonComponent('pfWizPrevious');
15978-
pfWizardButtonComponent('pfWizFinish');
15979-
pfWizardButtonComponent('pfWizCancel');
15980-
pfWizardButtonComponent('pfWizReset');
15989+
ctrl.$postLink = function () {
15990+
setupCallback($scope, $element, 'previous', ctrl.callback);
15991+
};
15992+
}]
15993+
});
15994+
15995+
angular.module('patternfly.wizard').component('pfWizFinish', {
15996+
bindings: {
15997+
callback: "=?"
15998+
},
15999+
controller: ["$element", "$scope", function ($element, $scope) {
16000+
var ctrl = this;
16001+
16002+
ctrl.$onInit = function () {
16003+
$scope.wizard = findWizard($scope);
16004+
};
16005+
16006+
ctrl.$postLink = function () {
16007+
setupCallback($scope, $element, 'finish', ctrl.callback);
16008+
};
16009+
}]
16010+
});
16011+
16012+
angular.module('patternfly.wizard').component('pfWizCancel', {
16013+
bindings: {
16014+
callback: "=?"
16015+
},
16016+
controller: ["$element", "$scope", function ($element, $scope) {
16017+
var ctrl = this;
16018+
16019+
ctrl.$onInit = function () {
16020+
$scope.wizard = findWizard($scope);
16021+
};
16022+
16023+
ctrl.$postLink = function () {
16024+
setupCallback($scope, $element, 'cancel', ctrl.callback);
16025+
};
16026+
}]
16027+
});
16028+
16029+
angular.module('patternfly.wizard').component('pfWizReset', {
16030+
bindings: {
16031+
callback: "=?"
16032+
},
16033+
controller: ["$element", "$scope", function ($element, $scope) {
16034+
var ctrl = this;
16035+
16036+
ctrl.$onInit = function () {
16037+
$scope.wizard = findWizard($scope);
16038+
};
16039+
16040+
ctrl.$postLink = function () {
16041+
setupCallback($scope, $element, 'reset', ctrl.callback);
16042+
};
16043+
}]
16044+
});
1598116045
})();
1598216046
;/**
1598316047
* @ngdoc directive

‎dist/angular-patternfly.min.js‎

Lines changed: 4 additions & 4 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: 103 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15933,51 +15933,115 @@ angular.module('patternfly.views').component('pfEmptyState', {
1593315933
})();
1593415934
;(function () {
1593515935
'use strict';
15936-
function pfWizardButtonComponent (action) {
15937-
angular.module('patternfly.wizard')
15938-
.component(action, {
15939-
bindings: {
15940-
callback: "=?"
15941-
},
15942-
controller: function ($element, $scope) {
15943-
var ctrl = this;
15944-
15945-
var findWizard = function (scope) {
15946-
var wizard;
1594715936

15948-
if (scope) {
15949-
if (angular.isDefined(scope.wizard)) {
15950-
wizard = scope.wizard;
15951-
} else {
15952-
wizard = findWizard(scope.$parent);
15953-
}
15954-
}
15937+
var findWizard = function (scope) {
15938+
var wizard;
1595515939

15956-
return wizard;
15957-
};
15940+
if (scope) {
15941+
if (angular.isDefined(scope.wizard)) {
15942+
wizard = scope.wizard;
15943+
} else {
15944+
wizard = findWizard(scope.$parent);
15945+
}
15946+
}
1595815947

15959-
ctrl.$onInit = function () {
15960-
$scope.wizard = findWizard($scope);
15961-
};
15948+
return wizard;
15949+
};
1596215950

15963-
ctrl.$postLink = function () {
15964-
$element.on("click", function (e) {
15965-
e.preventDefault();
15966-
$scope.$apply(function () {
15967-
// scope apply in button module
15968-
$scope.wizard[action.replace("pfWiz", "").toLowerCase()](ctrl.callback);
15969-
});
15970-
});
15971-
};
15972-
}
15951+
var setupCallback = function (scope, button, fnName, callback) {
15952+
button.on("click", function (e) {
15953+
e.preventDefault();
15954+
scope.$apply(function () {
15955+
// scope apply in button module
15956+
scope.wizard[fnName](callback);
1597315957
});
15974-
}
15958+
});
15959+
};
15960+
15961+
angular.module('patternfly.wizard').component('pfWizNext', {
15962+
bindings: {
15963+
callback: "=?"
15964+
},
15965+
controller: ["$element", "$scope", function ($element, $scope) {
15966+
var ctrl = this;
15967+
15968+
ctrl.$onInit = function () {
15969+
$scope.wizard = findWizard($scope);
15970+
};
15971+
15972+
ctrl.$postLink = function () {
15973+
setupCallback($scope, $element, 'next', ctrl.callback);
15974+
};
15975+
}]
15976+
});
15977+
15978+
angular.module('patternfly.wizard').component('pfWizPrevious', {
15979+
bindings: {
15980+
callback: "=?"
15981+
},
15982+
controller: ["$element", "$scope", function ($element, $scope) {
15983+
var ctrl = this;
15984+
15985+
ctrl.$onInit = function () {
15986+
$scope.wizard = findWizard($scope);
15987+
};
1597515988

15976-
pfWizardButtonComponent('pfWizNext');
15977-
pfWizardButtonComponent('pfWizPrevious');
15978-
pfWizardButtonComponent('pfWizFinish');
15979-
pfWizardButtonComponent('pfWizCancel');
15980-
pfWizardButtonComponent('pfWizReset');
15989+
ctrl.$postLink = function () {
15990+
setupCallback($scope, $element, 'previous', ctrl.callback);
15991+
};
15992+
}]
15993+
});
15994+
15995+
angular.module('patternfly.wizard').component('pfWizFinish', {
15996+
bindings: {
15997+
callback: "=?"
15998+
},
15999+
controller: ["$element", "$scope", function ($element, $scope) {
16000+
var ctrl = this;
16001+
16002+
ctrl.$onInit = function () {
16003+
$scope.wizard = findWizard($scope);
16004+
};
16005+
16006+
ctrl.$postLink = function () {
16007+
setupCallback($scope, $element, 'finish', ctrl.callback);
16008+
};
16009+
}]
16010+
});
16011+
16012+
angular.module('patternfly.wizard').component('pfWizCancel', {
16013+
bindings: {
16014+
callback: "=?"
16015+
},
16016+
controller: ["$element", "$scope", function ($element, $scope) {
16017+
var ctrl = this;
16018+
16019+
ctrl.$onInit = function () {
16020+
$scope.wizard = findWizard($scope);
16021+
};
16022+
16023+
ctrl.$postLink = function () {
16024+
setupCallback($scope, $element, 'cancel', ctrl.callback);
16025+
};
16026+
}]
16027+
});
16028+
16029+
angular.module('patternfly.wizard').component('pfWizReset', {
16030+
bindings: {
16031+
callback: "=?"
16032+
},
16033+
controller: ["$element", "$scope", function ($element, $scope) {
16034+
var ctrl = this;
16035+
16036+
ctrl.$onInit = function () {
16037+
$scope.wizard = findWizard($scope);
16038+
};
16039+
16040+
ctrl.$postLink = function () {
16041+
setupCallback($scope, $element, 'reset', ctrl.callback);
16042+
};
16043+
}]
16044+
});
1598116045
})();
1598216046
;/**
1598316047
* @ngdoc directive

‎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/9742960/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/884021d/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/9742960/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/884021d/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/9742960/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/884021d/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/9742960/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/884021d/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/9742960/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/884021d/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/9742960/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/884021d/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>

‎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/9742960/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/884021d/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)