Skip to content

Commit 1798aad

Browse files
Merge pull request #252 from patternfly/bump-v3.5.1
Bumped version number to 3.5.1
2 parents 952d3bc + 39de054 commit 1798aad

File tree

40 files changed

+780
-308
lines changed

40 files changed

+780
-308
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.5.0",
3+
"version": "3.5.1",
44
"authors": [
55
"Red Hat"
66
],
@@ -39,7 +39,7 @@
3939
"angular-sanitize": "1.3.0 - 1.5.*",
4040
"angular-bootstrap": "0.13.x",
4141
"lodash": "3.x",
42-
"patternfly": "~3.5.0"
42+
"patternfly": "~3.5.1"
4343
},
4444
"devDependencies": {
4545
"angular-mocks": "1.3.0 - 1.5.*"

dist/docs/css/angular-patternfly.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,10 @@
408408
margin-bottom: 10px;
409409
}
410410

411-
.panel-group .panel-default .panel-title > a:before {
411+
/* Angular bootstrap classes differ when opneed rather than when collapsed */
412+
accordion > .panel-group .panel-default .panel-title > a:before {
412413
content: "\f105";
413414
}
414-
.panel-group .panel-open .panel-title > a:before {
415+
accordion > .panel-group .panel-open .panel-title > a:before {
415416
content: "\f107";
416417
}

dist/docs/css/patternfly-additions.css

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

dist/docs/css/patternfly.css

Lines changed: 8 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-animate.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.6
2+
* @license AngularJS v1.5.7
33
* (c) 2010-2016 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -3213,8 +3213,6 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
32133213
// may attempt more elements, but custom drivers are more particular
32143214
for (var i = drivers.length - 1; i >= 0; i--) {
32153215
var driverName = drivers[i];
3216-
if (!$injector.has(driverName)) continue; // TODO(matsko): remove this check
3217-
32183216
var factory = $injector.get(driverName);
32193217
var driver = factory(animationDetails);
32203218
if (driver) {

dist/docs/grunt-scripts/angular-patternfly.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -550,11 +550,11 @@ angular.module('patternfly.card').directive('pfCard', function () {
550550
551551
<file name="index.html">
552552
<div ng-controller="ChartCtrl">
553-
<label class="label-title">Card With Single Trend Chart</label>
553+
<label class="label-title">Card With Single Trend</label>
554554
<div pf-card head-title="Cluster Utilization" show-top-border="true" footer="footerConfig" filter="filterConfig" style="width: 50%">
555555
<div pf-trends-chart config="configSingle" chart-data="dataSingle"></div>
556556
</div>
557-
<label class="label-title">Card With Multiple Trends</label>
557+
<label class="label-title">Card with Multiple Trends</label>
558558
<div pf-card head-title="Performance" sub-title="Last 30 Days" show-top-border="false"
559559
show-titles-separator="false" style="width: 65%" footer="actionBarConfig">
560560
<div pf-trends-chart config="configVirtual" chart-data="dataVirtual"></div>
@@ -3656,9 +3656,11 @@ angular.module( 'patternfly.notification' ).directive('pfInlineNotification', fu
36563656
* @param {object} notificationGroups Array of notification groups to add to the drawer
36573657
* @param {string} actionButtonTitle Text for the lower action button of the drawer (optional, if not specified there will be no action button)
36583658
* @param {function} actionButtonCallback function(notificationGroup) Callback method for action button for each group, the notificationGroup is passed (Optional)
3659+
* @param {string} titleInclude Include src for the title area for the notification drawer, use this to customize the drawer title area
36593660
* @param {string} headingInclude Include src for the heading area for each notification group, access the group via notificationGroup
36603661
* @param {string} subheadingInclude Include src for the sub-heading area for each notification group, access the group via notificationGroup
3661-
* @param {string} notificationBodyInclude Include src for the notification body for each notification, access the group via notification
3662+
* @param {string} notificationBodyInclude Include src for the notification body for each notification, access the notification via notification
3663+
* @param {string} notificationFooterInclude Include src for the notification footer for each notification, access the notification via notification
36623664
* @param {object} customScope Object containing any variables/functions used by the included src, access via customScope.<xxx>
36633665
*
36643666
* @example
@@ -3684,7 +3686,7 @@ angular.module( 'patternfly.notification' ).directive('pfInlineNotification', fu
36843686
<div pf-notification-drawer drawer-hidden="hideDrawer" drawer-title="Notifications Drawer"
36853687
action-button-title="Mark All Read" action-button-callback="actionButtonCB" notification-groups="groups"
36863688
heading-include="heading.html" subheading-include="subheading.html" notification-body-include="notification-body.html"
3687-
custom-scope="customScope">
3689+
notification-footer-include="notification-footer.html" custom-scope="customScope">
36883690
</div>
36893691
</div>
36903692
</div>
@@ -3702,6 +3704,12 @@ angular.module( 'patternfly.notification' ).directive('pfInlineNotification', fu
37023704
<file name="subheading.html">
37033705
{{notificationGroup.subHeading}}
37043706
</file>
3707+
<file name="notification-footer.html">
3708+
<a class="btn btn-link btn-block" role="button" ng-click="customScope.clearAll(notificationGroup)">
3709+
<span class="pficon pficon-close"></span>
3710+
<span> Clear All</span>
3711+
</a>
3712+
</file>
37053713
<file name="notification-body.html">
37063714
<div class="dropdown pull-right dropdown-kebab-pf" ng-if="notification.actions && notification.actions.length > 0">
37073715
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownKebabRight" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@@ -4035,6 +4043,10 @@ angular.module( 'patternfly.notification' ).directive('pfInlineNotification', fu
40354043
var newText = notification.message + " - " + action.name;
40364044
$scope.actionsText = newText + "\n" + $scope.actionsText;
40374045
};
4046+
$scope.customScope.clearAll = function (group) {
4047+
var newText = group.heading + " - Clear All";
4048+
$scope.actionsText = newText + "\n" + $scope.actionsText;
4049+
};
40384050
40394051
}
40404052
]);
@@ -4051,9 +4063,11 @@ angular.module('patternfly.notification').directive('pfNotificationDrawer', ["$w
40514063
notificationGroups: '=',
40524064
actionButtonTitle: '@',
40534065
actionButtonCallback: '=?',
4066+
titleInclude: '@',
40544067
headingInclude: '@',
40554068
subheadingInclude: '@',
40564069
notificationBodyInclude: '@',
4070+
notificationFooterInclude: '@',
40574071
customScope: '=?'
40584072
},
40594073
templateUrl: 'notification/notification-drawer.html',
@@ -6540,7 +6554,7 @@ angular.module('patternfly.views').directive('pfListView', ["$timeout", "$window
65406554
'use strict';
65416555

65426556
$templateCache.put('card/aggregate-status/aggregate-status-card.html',
6543-
"<div ng-if=!isMiniLayout class=\"card-pf card-pf-aggregate-status\" ng-class=\"{'card-pf-accented': shouldShowTopBorder, 'card-pf-aggregate-status-alt': isAltLayout}\"><h2 class=card-pf-title><a href={{status.href}} ng-if=status.href><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{status.iconClass}}></span> <span class=card-pf-aggregate-status-count>{{status.count}}</span> <span class=card-pf-aggregate-status-title>{{status.title}}</span></a> <span ng-if=!status.href><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{status.iconClass}}></span> <span class=card-pf-aggregate-status-count>{{status.count}}</span> <span class=card-pf-aggregate-status-title>{{status.title}}</span></span></h2><div class=card-pf-body><p class=card-pf-aggregate-status-notifications><span class=card-pf-aggregate-status-notification ng-repeat=\"notification in status.notifications\"><a href={{notification.href}} ng-if=notification.href><image ng-if=notification.iconImage ng-src={{notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{notification.iconClass}}></span>{{ notification.count }}</a> <span ng-if=!notification.href><image ng-if=notification.iconImage ng-src={{notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{notification.iconClass}}></span>{{ notification.count }}</span></span></p></div></div><div ng-if=isMiniLayout class=\"card-pf card-pf-aggregate-status card-pf-aggregate-status-mini\" ng-class=\"{'card-pf-accented': shouldShowTopBorder}\"><h2 class=card-pf-title><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.iconClass class={{status.iconClass}}></span> <a ng-if=status.href href={{status.href}}><span class=card-pf-aggregate-status-count>{{status.count}}</span> {{status.title}}</a> <span ng-if=!status.href><span class=card-pf-aggregate-status-count>{{status.count}}</span> {{status.title}}</span></h2><div class=card-pf-body><p ng-if=\"status.notification.iconImage || status.notification.iconClass || status.notification.count\" class=card-pf-aggregate-status-notifications><span class=card-pf-aggregate-status-notification><a ng-if=status.notification.href href={{status.notification.href}}><image ng-if=status.notification.iconImage ng-src={{status.notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.notification.iconClass class={{status.notification.iconClass}}></span><span ng-if=status.notification.count>{{status.notification.count}}</span></a> <span ng-if=!status.notification.href><image ng-if=status.notification.iconImage ng-src={{status.notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.notification.iconClass class={{status.notification.iconClass}}></span><span ng-if=status.notification.count>{{status.notification.count}}</span></span></span></p></div></div>"
6557+
"<div ng-if=!isMiniLayout class=\"card-pf card-pf-aggregate-status\" ng-class=\"{'card-pf-accented': shouldShowTopBorder, 'card-pf-aggregate-status-alt': isAltLayout}\"><h2 class=card-pf-title><a href={{status.href}} ng-if=status.href><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{status.iconClass}}></span> <span class=card-pf-aggregate-status-count>{{status.count}}</span> <span class=card-pf-aggregate-status-title>{{status.title}}</span></a> <span ng-if=!status.href><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{status.iconClass}}></span> <span class=card-pf-aggregate-status-count>{{status.count}}</span> <span class=card-pf-aggregate-status-title>{{status.title}}</span></span></h2><div class=card-pf-body><p class=card-pf-aggregate-status-notifications><span class=card-pf-aggregate-status-notification ng-repeat=\"notification in status.notifications\"><a href={{notification.href}} ng-if=notification.href><image ng-if=notification.iconImage ng-src={{notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{notification.iconClass}}></span>{{ notification.count }}</a> <span ng-if=!notification.href><image ng-if=notification.iconImage ng-src={{notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span class={{notification.iconClass}}></span>{{ notification.count }}</span></span></p></div></div><div ng-if=isMiniLayout class=\"card-pf card-pf-aggregate-status card-pf-aggregate-status-mini\" ng-class=\"{'card-pf-accented': shouldShowTopBorder}\"><h2 class=card-pf-title><a ng-if=status.href href={{status.href}}><image ng-if=status.iconImage ng-src={{status.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.iconClass class={{status.iconClass}}></span> <span class=card-pf-aggregate-status-count>{{status.count}}</span> {{status.title}}</a> <span ng-if=!status.href><span class=card-pf-aggregate-status-count>{{status.count}}</span> {{status.title}}</span></h2><div class=card-pf-body><p ng-if=\"status.notification.iconImage || status.notification.iconClass || status.notification.count\" class=card-pf-aggregate-status-notifications><span class=card-pf-aggregate-status-notification><a ng-if=status.notification.href href={{status.notification.href}}><image ng-if=status.notification.iconImage ng-src={{status.notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.notification.iconClass class={{status.notification.iconClass}}></span><span ng-if=status.notification.count>{{status.notification.count}}</span></a> <span ng-if=!status.notification.href><image ng-if=status.notification.iconImage ng-src={{status.notification.iconImage}} alt=\"\" class=card-pf-icon-image></image><span ng-if=status.notification.iconClass class={{status.notification.iconClass}}></span><span ng-if=status.notification.count>{{status.notification.count}}</span></span></span></p></div></div>"
65446558
);
65456559

65466560

@@ -6648,7 +6662,7 @@ angular.module('patternfly.views').directive('pfListView', ["$timeout", "$window
66486662

66496663

66506664
$templateCache.put('notification/notification-drawer.html',
6651-
"<div class=drawer-pf ng-class=\"{hide: drawerHidden}\"><div class=drawer-pf-title><h3 class=text-center>{{drawerTitle}}</h3></div><div pf-fixed-accordion scroll-selector=.panel-body><div class=panel-group><div class=\"panel panel-default\" ng-repeat=\"notificationGroup in notificationGroups track by $index\"><div class=panel-heading><h4 class=panel-title><a ng-click=toggleCollapse(notificationGroup) ng-class=\"{collapsed: !notificationGroup.open}\" ng-include src=headingInclude></a></h4><span class=panel-counter ng-include src=subheadingInclude></span></div><div class=\"panel-collapse collapse\" ng-class=\"{in: notificationGroup.open}\"><div class=panel-body><div class=drawer-pf-notification ng-class=\"{unread: notification.unread}\" ng-repeat=\"notification in notificationGroup.notifications\" ng-include src=notificationBodyInclude></div><div ng-if=notificationGroup.isLoading class=\"drawer-pf-loading text-center\"><span class=\"spinner spinner-xs spinner-inline\"></span> Loading More</div></div><div class=drawer-pf-action ng-if=actionButtonTitle><a class=\"btn btn-link btn-block\" ng-click=actionButtonCallback(notificationGroup)>{{actionButtonTitle}}</a></div></div></div></div></div></div>"
6665+
"<div class=drawer-pf ng-class=\"{'hide': drawerHidden}\"><div ng-if=drawerTitle class=drawer-pf-title><h3 class=text-center>{{drawerTitle}}</h3></div><div ng-if=titleInclude class=drawer-pf-title ng-include src=titleInclude></div><div pf-fixed-accordion scroll-selector=.panel-body><div class=panel-group><div class=\"panel panel-default\" ng-repeat=\"notificationGroup in notificationGroups track by $index\"><div class=panel-heading><h4 class=panel-title><a ng-click=toggleCollapse(notificationGroup) ng-class=\"{collapsed: !notificationGroup.open}\" ng-include src=headingInclude></a></h4><span class=panel-counter ng-include src=subheadingInclude></span></div><div class=\"panel-collapse collapse\" ng-class=\"{in: notificationGroup.open}\"><div class=panel-body><div class=drawer-pf-notification ng-class=\"{unread: notification.unread}\" ng-repeat=\"notification in notificationGroup.notifications\" ng-include src=notificationBodyInclude></div><div ng-if=notificationGroup.isLoading class=\"drawer-pf-loading text-center\"><span class=\"spinner spinner-xs spinner-inline\"></span> Loading More</div></div><div class=drawer-pf-action ng-if=actionButtonTitle><a class=\"btn btn-link btn-block\" ng-click=actionButtonCallback(notificationGroup)>{{actionButtonTitle}}</a></div><div ng-if=notificationFooterInclude ng-include src=notificationFooterInclude></div></div></div></div></div></div>"
66526666
);
66536667

66546668

dist/docs/grunt-scripts/angular-sanitize.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.6
2+
* @license AngularJS v1.5.7
33
* (c) 2010-2016 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -659,6 +659,11 @@ angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
659659
if (text == null || text === '') return text;
660660
if (!isString(text)) throw linkyMinErr('notstring', 'Expected string but received: {0}', text);
661661

662+
var attributesFn =
663+
angular.isFunction(attributes) ? attributes :
664+
angular.isObject(attributes) ? function getAttributesObject() {return attributes;} :
665+
function getEmptyAttributesObject() {return {};};
666+
662667
var match;
663668
var raw = text;
664669
var html = [];
@@ -687,19 +692,14 @@ angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
687692
}
688693

689694
function addLink(url, text) {
690-
var key;
695+
var key, linkAttributes = attributesFn(url);
691696
html.push('<a ');
692-
if (angular.isFunction(attributes)) {
693-
attributes = attributes(url);
694-
}
695-
if (angular.isObject(attributes)) {
696-
for (key in attributes) {
697-
html.push(key + '="' + attributes[key] + '" ');
698-
}
699-
} else {
700-
attributes = {};
697+
698+
for (key in linkAttributes) {
699+
html.push(key + '="' + linkAttributes[key] + '" ');
701700
}
702-
if (angular.isDefined(target) && !('target' in attributes)) {
701+
702+
if (angular.isDefined(target) && !('target' in linkAttributes)) {
703703
html.push('target="',
704704
target,
705705
'" ');

0 commit comments

Comments
 (0)