Skip to content

Commit c9f1ea8

Browse files
Merge branch '_bump_next-v4.0.0-rc.1-local' into branch-4.0-dev-dist
2 parents 4045e3c + 931545d commit c9f1ea8

File tree

68 files changed

+488
-130
lines changed

Some content is hidden

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

68 files changed

+488
-130
lines changed

bower.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "4.0.0-alpha.3",
3+
"version": "4.0.0-rc.1",
44
"authors": [
55
"Red Hat"
66
],
@@ -47,10 +47,13 @@
4747
"datatables.net": "^1.10.12",
4848
"datatables.net-select": "~1.2.0",
4949
"lodash": "4.x",
50-
"patternfly": "~4.0.0-alpha.3"
50+
"patternfly": "~4.0.0-rc.1"
5151
},
5252
"devDependencies": {
5353
"angular-mocks": "1.5.*",
5454
"angular-ui-router": "^1.0.0-beta.3"
55+
},
56+
"resolutions": {
57+
"jquery": "~2.1.4"
5558
}
5659
}

dist/angular-patternfly.js

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,8 +3537,9 @@ angular.module('patternfly.card').component('pfCard', {
35373537
controller: ["$timeout", "$attrs", function ($timeout, $attrs) {
35383538
var ctrl = this, prevConfig;
35393539

3540+
// store the chart object
3541+
var chart;
35403542
ctrl.generateChart = function () {
3541-
var chart;
35423543
var chartData;
35433544

35443545
// Need to deep watch changes in chart config
@@ -3548,7 +3549,12 @@ angular.module('patternfly.card').component('pfCard', {
35483549
chartData = ctrl.config;
35493550
if (chartData) {
35503551
chartData.bindto = '#' + $attrs.id;
3551-
chart = c3.generate(chartData);
3552+
if (!chart) {
3553+
chart = c3.generate(chartData);
3554+
} else {
3555+
//if it is created, then, we only need to load changes
3556+
chart.load(scope.config.data);
3557+
}
35523558
ctrl.getChartCallback(chart);
35533559
prevConfig = angular.copy(ctrl.config);
35543560
}
@@ -10464,8 +10470,11 @@ angular.module( 'patternfly.notification' ).component('pfToastNotification', {
1046410470
* @name patternfly.select.component:pfSelect
1046510471
* @restrict E
1046610472
*
10467-
* @param {string} ngModel Model binding using the {@link https://docs.angularjs.org/api/ng/type/ngModel.NgModelController/ NgModelController} is mandatory.
10468-
* @param {string=} ngOptions The `{@link https://docs.angularjs.org/api/ng/directive/select/ ngOptions}` attribute can be used to dynamically generate a list of `<option>` elements
10473+
* @param {object} selected Curently selected value
10474+
* @param {object} options Array of valid selections
10475+
* @param {string} displayField Field from the object in the array to display for selection (optional)
10476+
* @param {string} emptyValue value to display when nothing is selected
10477+
* @param {function(item)} onSelect Function to call upon user selection of an item.
1046910478
*
1047010479
* @description
1047110480
* The pfSelect component provides a wrapper for the angular ui bootstrap dropdown container allowing for use of ng-model and ng-options
@@ -13571,7 +13580,7 @@ angular.module('patternfly.views').component('pfEmptyState', {
1357113580
* <li>.onCheckBoxChange - ( function(item) ) Called to notify when a checkbox selection changes, default is none
1357213581
* <li>.onSelect - ( function(item, event) ) Called to notify of item selection, default is none
1357313582
* <li>.onSelectionChange - ( function(items) ) Called to notify when item selections change, default is none
13574-
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none
13583+
* <li>.onClick - ( function(item, event) ) Called to notify when an item is clicked, default is none. Note: row expansion is the default behavior after onClick performed, but user can stop such default behavior by adding the sentence "return false;" to the end of onClick function body
1357513584
* <li>.onDblClick - ( function(item, event) ) Called to notify when an item is double clicked, default is none
1357613585
* </ul>
1357713586
* @param {array} actionButtons List of action buttons in each row
@@ -14124,6 +14133,7 @@ angular.module('patternfly.views').component('pfListView', {
1412414133
var alreadySelected;
1412514134
var selectionChanged = false;
1412614135
var continueEvent = true;
14136+
var enableRowExpansion = ctrl.config && ctrl.config.useExpandingRows && item && !item.disableRowExpansion;
1412714137

1412814138
// Ignore disabled item clicks completely
1412914139
if (ctrl.checkDisabled(item)) {
@@ -14166,7 +14176,11 @@ angular.module('patternfly.views').component('pfListView', {
1416614176
}
1416714177
}
1416814178
if (ctrl.config.onClick) {
14169-
ctrl.config.onClick(item, e);
14179+
if (ctrl.config.onClick(item, e) !== false && enableRowExpansion) {
14180+
ctrl.toggleItemExpansion(item);
14181+
}
14182+
} else if (enableRowExpansion) {
14183+
ctrl.toggleItemExpansion(item);
1417014184
}
1417114185

1417214186
return continueEvent;
@@ -15685,7 +15699,7 @@ angular.module('patternfly.wizard').component('pfWizard', {
1568515699

1568615700

1568715701
$templateCache.put('views/listview/list-view.html',
15688-
"<span><div class=\"list-group list-view-pf\" dnd-list=$ctrl.items ng-class=\"{'list-view-pf-dnd': $ctrl.config.dragEnabled === true}\" ng-if=\"$ctrl.config.itemsAvailable !== false\"><div class=dndPlaceholder></div><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in $ctrl.items track by $index\" dnd-draggable=item dnd-effect-allowed=move dnd-disable-if=\"$ctrl.config.dragEnabled !== true\" dnd-dragstart=$ctrl.dragStart(item) dnd-moved=$ctrl.dragMoved() dnd-dragend=$ctrl.dragEnd() ng-class=\"{'drag-original': $ctrl.isDragOriginal(item), 'pf-selectable': $ctrl.selectItems, 'active': $ctrl.isSelected(item), 'disabled': $ctrl.checkDisabled(item), 'list-view-pf-expand-active': item.isExpanded}\"><div class=list-group-item-header><div class=list-view-pf-dnd-drag-items ng-if=\"$ctrl.config.dragEnabled === true\"><div pf-transclude=parent class=list-view-pf-main-info></div></div><div ng-class=\"{'list-view-pf-dnd-original-items': $ctrl.config.dragEnabled === true}\"><div class=list-view-pf-expand ng-if=$ctrl.config.useExpandingRows><span class=\"fa fa-angle-right\" ng-show=!item.disableRowExpansion ng-click=$ctrl.toggleItemExpansion(item) ng-class=\"{'fa-angle-down': item.isExpanded}\"></span> <span class=pf-expand-placeholder ng-show=item.disableRowExpansion></span></div><div class=list-view-pf-checkbox ng-if=$ctrl.config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=$ctrl.checkDisabled(item) ng-change=\"$ctrl.checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"($ctrl.actionButtons && $ctrl.actionButtons.length > 0) || ($ctrl.menuActions && $ctrl.menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in $ctrl.actionButtons\" title={{actionButton.title}} ng-class=\"{'disabled' : $ctrl.checkDisabled(item) || !$ctrl.enableButtonForItem(actionButton, item)}\" ng-click=\"$ctrl.handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div uib-dropdown class=\"{{$ctrl.dropdownClass}} pull-right dropdown-kebab-pf {{$ctrl.getMenuClassForItem(item)}} {{$ctrl.hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"$ctrl.menuActions && $ctrl.menuActions.length > 0\"><button uib-dropdown-toggle class=\"btn btn-link\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': $ctrl.checkDisabled(item)}\" ng-click=\"$ctrl.setupActions(item, $event)\"><span class=\"fa fa-ellipsis-v\"></span></button><ul uib-dropdown-menu class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in $ctrl.menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"$ctrl.handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"$ctrl.itemClick($event, item)\" ng-dblclick=\"$ctrl.dblClick($event, item)\"></div></div><div class=\"list-group-item-container container-fluid\" ng-transclude=expandedContent ng-if=\"$ctrl.config.useExpandingRows && item.isExpanded\"></div></div></div></div><pf-empty-state ng-if=\"$ctrl.config.itemsAvailable === false\" config=$ctrl.emptyStateConfig></pf-empty-state></span>"
15702+
"<span><div class=\"list-group list-view-pf list-view-pf-view\" dnd-list=$ctrl.items ng-class=\"{'list-view-pf-dnd': $ctrl.config.dragEnabled === true}\" ng-if=\"$ctrl.config.itemsAvailable !== false\"><div class=dndPlaceholder></div><div class=\"list-group-item {{item.rowClass}}\" ng-repeat=\"item in $ctrl.items track by $index\" dnd-draggable=item dnd-effect-allowed=move dnd-disable-if=\"$ctrl.config.dragEnabled !== true\" dnd-dragstart=$ctrl.dragStart(item) dnd-moved=$ctrl.dragMoved() dnd-dragend=$ctrl.dragEnd() ng-class=\"{'drag-original': $ctrl.isDragOriginal(item), 'pf-selectable': $ctrl.selectItems, 'active': $ctrl.isSelected(item), 'disabled': $ctrl.checkDisabled(item), 'list-view-pf-expand-active': item.isExpanded}\"><div class=list-group-item-header><div class=list-view-pf-dnd-drag-items ng-if=\"$ctrl.config.dragEnabled === true\"><div pf-transclude=parent class=list-view-pf-main-info></div></div><div ng-class=\"{'list-view-pf-dnd-original-items': $ctrl.config.dragEnabled === true}\"><div class=list-view-pf-expand ng-if=$ctrl.config.useExpandingRows><span class=\"fa fa-angle-right\" ng-show=!item.disableRowExpansion ng-click=$ctrl.toggleItemExpansion(item) ng-class=\"{'fa-angle-down': item.isExpanded}\"></span> <span class=pf-expand-placeholder ng-show=item.disableRowExpansion></span></div><div class=list-view-pf-checkbox ng-if=$ctrl.config.showSelectBox><input type=checkbox value=item.selected ng-model=item.selected ng-disabled=$ctrl.checkDisabled(item) ng-change=\"$ctrl.checkBoxChange(item)\"></div><div class=list-view-pf-actions ng-if=\"($ctrl.actionButtons && $ctrl.actionButtons.length > 0) || ($ctrl.menuActions && $ctrl.menuActions.length > 0)\"><button class=\"btn btn-default {{actionButton.class}}\" ng-repeat=\"actionButton in $ctrl.actionButtons\" title={{actionButton.title}} ng-class=\"{'disabled' : $ctrl.checkDisabled(item) || !$ctrl.enableButtonForItem(actionButton, item)}\" ng-click=\"$ctrl.handleButtonAction(actionButton, item)\"><div ng-if=actionButton.include class=actionButton.includeClass ng-include src=actionButton.include></div><span ng-if=!actionButton.include>{{actionButton.name}}</span></button><div uib-dropdown class=\"{{$ctrl.dropdownClass}} pull-right dropdown-kebab-pf {{$ctrl.getMenuClassForItem(item)}} {{$ctrl.hideMenuForItem(item) ? 'invisible' : ''}}\" id=kebab_{{$index}} ng-if=\"$ctrl.menuActions && $ctrl.menuActions.length > 0\"><button uib-dropdown-toggle class=\"btn btn-link\" type=button id=dropdownKebabRight_{{$index}} ng-class=\"{'disabled': $ctrl.checkDisabled(item)}\" ng-click=\"$ctrl.setupActions(item, $event)\"><span class=\"fa fa-ellipsis-v\"></span></button><ul uib-dropdown-menu class=\"dropdown-menu dropdown-menu-right {{$index}}\" aria-labelledby=dropdownKebabRight_{{$index}}><li ng-repeat=\"menuAction in $ctrl.menuActions\" ng-if=\"menuAction.isVisible !== false\" role=\"{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}\" ng-class=\"{'divider': (menuAction.isSeparator === true), 'disabled': (menuAction.isDisabled === true)}\"><a ng-if=\"menuAction.isSeparator !== true\" title={{menuAction.title}} ng-click=\"$ctrl.handleMenuAction(menuAction, item)\">{{menuAction.name}}</a></li></ul></div></div><div pf-transclude=parent class=list-view-pf-main-info ng-click=\"$ctrl.itemClick($event, item)\" ng-dblclick=\"$ctrl.dblClick($event, item)\"></div></div><div class=\"list-group-item-container container-fluid\" ng-transclude=expandedContent ng-if=\"$ctrl.config.useExpandingRows && item.isExpanded\"></div></div></div></div><pf-empty-state ng-if=\"$ctrl.config.itemsAvailable === false\" config=$ctrl.emptyStateConfig></pf-empty-state></span>"
1568915703
);
1569015704

1569115705
}]);

dist/angular-patternfly.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/css/examples.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ hr {
4646
height: 100%;
4747
width: 100%;
4848
overflow-y: auto;
49+
background-color: #fff;
4950
}
5051

5152
.list-view-container {

0 commit comments

Comments
 (0)