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 Jul 5, 2018
2 parents 1cfdcb1 + 161017f commit e0f4ae6
Show file tree
Hide file tree
Showing 64 changed files with 253 additions and 106 deletions.
57 changes: 46 additions & 11 deletions dist/angular-patternfly.js
Original file line number Diff line number Diff line change
Expand Up @@ -9178,13 +9178,14 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
format: '@?',
dateOptions: '<?',
isOpen: '<?',
popupPlacement: '@?'
popupPlacement: '@?',
onDateChange: '&'
},
templateUrl: 'datepicker/datepicker.html',
controller: function () {
'use strict';

var ctrl = this;
var ctrl = this, prevDate;

ctrl.defaultDateOptions = {
showWeeks : false,
Expand All @@ -9205,9 +9206,19 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
};

ctrl.$onChanges = function (changes) {
prevDate = angular.copy(ctrl.date);
_.defaults(ctrl.isOpen, ctrl.defaultIsOpen);
};

ctrl.$doCheck = function () {
// do a deep compare on data
if (!angular.equals(ctrl.date, prevDate)) {
prevDate = angular.copy(ctrl.date);
if (ctrl.onDateChange) {
ctrl.onDateChange({newDate: ctrl.date});
}
}
};
}
});
;/**
Expand All @@ -9217,6 +9228,7 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
*
* @param {date} date Must be a Javascript Date - to be displayed in the input. Can be left empty.
* @param {string} format Optional date format for displayed dates ('MM/dd/yyyy' by default).
* @param {function} on-date-change Optional user defined function which is called when the date is changed by the picker.<br/>
* @param {boolean} isOpen Optional boolean for determining whether or not to have the datepicker default to open (false by default).
* @param {string} popupPlacement Optional configuration string used to position the popup datepicker relative to the input element. See {@link https://angular-ui.github.io/bootstrap/#datepickerPopup Angular UI Datepicker Popup}.
* @param {object} dateOptions Optional uib-datepicker configuration object. See {@link https://angular-ui.github.io/bootstrap/#datepicker Angular UI Datepicker}.
Expand All @@ -9228,33 +9240,56 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
<example module="patternfly.datepicker">

<file name="index.html">
<div ng-controller="DemoBootstrapDatepicker">
<pf-bootstrap-datepicker
date="date">
</pf-bootstrap-datepicker>
<pf-bootstrap-datepicker
date=""
<div ng-controller="DemoBootstrapDatepicker" class="row example-container">
<div class="form-group">
<label class="col-sm-2 control-label" for="date-one">Date One:</label>
<pf-bootstrap-datepicker
id="date-one"
date="dateOne"
on-date-change="firstDateChanged(newDate)">
</pf-bootstrap-datepicker>
<label class="col-sm-2 control-label" for="date-one">Date Two:</label>
<pf-bootstrap-datepicker
id="date-two"
date="dateTwo"
format="{{format1}}"
is-open="isOpen"
popup-placement="{{popupPlacement}}"
date-options="dateOptions">
</pf-bootstrap-datepicker>
date-options="dateOptions"
on-date-change="secondDateChanged(newDate)">
</pf-bootstrap-datepicker>
</div>
<div class="col-md-12">
<label style="font-weight:normal;vertical-align:center;">Events: </label>
</div>
<div class="col-md-12">
<textarea rows="10" class="col-md-12">{{eventText}}</textarea>
</div>
</div>
</file>

<file name="script.js">
angular.module('patternfly.datepicker').controller('DemoBootstrapDatepicker', function( $scope ) {
$scope.eventText = '';

// first datepicker
$scope.date = new Date("Jan 1, 2000");
$scope.dateOne = new Date("Jan 1, 2000");
$scope.firstDateChanged = function(date) {
$scope.eventText = 'Date One Updated to: ' + date + '\r\n' + $scope.eventText;
};

// second datepicker
$scope.dateTwo = new Date("Feb 1, 2000");
$scope.format1 = "MM/dd/yy";
$scope.dateOptions = {
showWeeks : true
};
$scope.isOpen = true;
$scope.popupPlacement = "bottom-left";

$scope.secondDateChanged = function(date) {
$scope.eventText = 'Date Two Updated to: ' + date + '\r\n' + $scope.eventText;
};
});
</file>

Expand Down
10 changes: 5 additions & 5 deletions dist/angular-patternfly.min.js

Large diffs are not rendered by default.

57 changes: 46 additions & 11 deletions dist/docs/grunt-scripts/angular-patternfly.js
Original file line number Diff line number Diff line change
Expand Up @@ -9178,13 +9178,14 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
format: '@?',
dateOptions: '<?',
isOpen: '<?',
popupPlacement: '@?'
popupPlacement: '@?',
onDateChange: '&'
},
templateUrl: 'datepicker/datepicker.html',
controller: function () {
'use strict';

var ctrl = this;
var ctrl = this, prevDate;

ctrl.defaultDateOptions = {
showWeeks : false,
Expand All @@ -9205,9 +9206,19 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
};

ctrl.$onChanges = function (changes) {
prevDate = angular.copy(ctrl.date);
_.defaults(ctrl.isOpen, ctrl.defaultIsOpen);
};

ctrl.$doCheck = function () {
// do a deep compare on data
if (!angular.equals(ctrl.date, prevDate)) {
prevDate = angular.copy(ctrl.date);
if (ctrl.onDateChange) {
ctrl.onDateChange({newDate: ctrl.date});
}
}
};
}
});
;/**
Expand All @@ -9217,6 +9228,7 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
*
* @param {date} date Must be a Javascript Date - to be displayed in the input. Can be left empty.
* @param {string} format Optional date format for displayed dates ('MM/dd/yyyy' by default).
* @param {function} on-date-change Optional user defined function which is called when the date is changed by the picker.<br/>
* @param {boolean} isOpen Optional boolean for determining whether or not to have the datepicker default to open (false by default).
* @param {string} popupPlacement Optional configuration string used to position the popup datepicker relative to the input element. See {@link https://angular-ui.github.io/bootstrap/#datepickerPopup Angular UI Datepicker Popup}.
* @param {object} dateOptions Optional uib-datepicker configuration object. See {@link https://angular-ui.github.io/bootstrap/#datepicker Angular UI Datepicker}.
Expand All @@ -9228,33 +9240,56 @@ angular.module('patternfly.charts').component('pfUtilizationTrendChart', {
<example module="patternfly.datepicker">

<file name="index.html">
<div ng-controller="DemoBootstrapDatepicker">
<pf-bootstrap-datepicker
date="date">
</pf-bootstrap-datepicker>
<pf-bootstrap-datepicker
date=""
<div ng-controller="DemoBootstrapDatepicker" class="row example-container">
<div class="form-group">
<label class="col-sm-2 control-label" for="date-one">Date One:</label>
<pf-bootstrap-datepicker
id="date-one"
date="dateOne"
on-date-change="firstDateChanged(newDate)">
</pf-bootstrap-datepicker>
<label class="col-sm-2 control-label" for="date-one">Date Two:</label>
<pf-bootstrap-datepicker
id="date-two"
date="dateTwo"
format="{{format1}}"
is-open="isOpen"
popup-placement="{{popupPlacement}}"
date-options="dateOptions">
</pf-bootstrap-datepicker>
date-options="dateOptions"
on-date-change="secondDateChanged(newDate)">
</pf-bootstrap-datepicker>
</div>
<div class="col-md-12">
<label style="font-weight:normal;vertical-align:center;">Events: </label>
</div>
<div class="col-md-12">
<textarea rows="10" class="col-md-12">{{eventText}}</textarea>
</div>
</div>
</file>

<file name="script.js">
angular.module('patternfly.datepicker').controller('DemoBootstrapDatepicker', function( $scope ) {
$scope.eventText = '';

// first datepicker
$scope.date = new Date("Jan 1, 2000");
$scope.dateOne = new Date("Jan 1, 2000");
$scope.firstDateChanged = function(date) {
$scope.eventText = 'Date One Updated to: ' + date + '\r\n' + $scope.eventText;
};

// second datepicker
$scope.dateTwo = new Date("Feb 1, 2000");
$scope.format1 = "MM/dd/yy";
$scope.dateOptions = {
showWeeks : true
};
$scope.isOpen = true;
$scope.popupPlacement = "bottom-left";

$scope.secondDateChanged = function(date) {
$scope.eventText = 'Date Two Updated to: ' + date + '\r\n' + $scope.eventText;
};
});
</file>

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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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/9094b8c/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/6596116/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
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/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/9094b8c/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/c3/c3-chart.component.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6596116/src/charts/c3/c3-chart.component.js#L76" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfC3Chart</code>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</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/charts/donut/examples/donut-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/9094b8c/src/charts/donut/examples/donut-chart.js#L94" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutChart</code>
<a href="https://github.com/patternfly/angular-patternfly/edit/master/src/charts/donut/examples/donut-chart.js" class="improve-docs"><i class="icon-edit"> </i>Improve this doc</a><a href="https://github.com/patternfly/angular-patternfly/blob/6596116/src/charts/donut/examples/donut-chart.js#L94" class="view-source"><i class="icon-eye-open"> </i>View source</a><h1><code ng:non-bindable="">pfDonutChart</code>
<div><span class="hint">directive in module <code ng:non-bindable="">patternfly.charts</code>
</span>
</div>
Expand Down
Loading

0 comments on commit e0f4ae6

Please sign in to comment.