Skip to content

Commit f338ef5

Browse files
patternfly-buildpatternfly-build
committed
Merge branch 'master-local' into master-dist
2 parents 47a92cf + 256db99 commit f338ef5

File tree

74 files changed

+409
-157
lines changed

Some content is hidden

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

74 files changed

+409
-157
lines changed

‎dist/angular-patternfly.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21217,7 +21217,7 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
2121721217

2121821218

2121921219
$templateCache.put('navigation/vertical-navigation.html',
21220-
"<div><nav class=\"navbar navbar-pf-vertical\"><div class=navbar-header><button type=button class=navbar-toggle ng-click=$ctrl.handleNavBarToggleClick()><span class=sr-only>Toggle navigation</span> <span class=icon-bar></span> <span class=icon-bar></span> <span class=icon-bar></span></button> <span class=navbar-brand><img class=navbar-brand-icon ng-if=$ctrl.brandSrc ng-src={{$ctrl.brandSrc}} alt=\"{{$ctrl.brandAlt}}\"> <span class=navbar-brand-txt ng-if=!$ctrl.brandSrc>{{$ctrl.brandAlt}}</span></span></div><nav class=\"collapse navbar-collapse\" ng-transclude></nav><div class=nav-pf-vertical ng-class=\"{'nav-pf-persistent-secondary': $ctrl.persistentSecondary,\n" +
21220+
"<div><nav class=\"navbar navbar-pf-vertical\"><div class=navbar-header ng-class=\"{'ignore-mobile': $ctrl.ignoreMobile}\"><button type=button class=navbar-toggle ng-click=$ctrl.handleNavBarToggleClick()><span class=sr-only>Toggle navigation</span> <span class=icon-bar></span> <span class=icon-bar></span> <span class=icon-bar></span></button> <span class=navbar-brand><img class=navbar-brand-icon ng-if=$ctrl.brandSrc ng-src={{$ctrl.brandSrc}} alt=\"{{$ctrl.brandAlt}}\"> <span class=navbar-brand-txt ng-if=!$ctrl.brandSrc>{{$ctrl.brandAlt}}</span></span></div><nav class=\"collapse navbar-collapse\" ng-class=\"{'ignore-mobile': $ctrl.ignoreMobile}\" ng-transclude></nav><div class=nav-pf-vertical ng-class=\"{'nav-pf-persistent-secondary': $ctrl.persistentSecondary,\n" +
2122121221
" 'nav-pf-vertical-collapsible-menus': $ctrl.pinnableMenus,\n" +
2122221222
" 'hidden-icons-pf': $ctrl.hiddenIcons,\n" +
2122321223
" 'nav-pf-vertical-with-badges': $ctrl.showBadges,\n" +
@@ -21236,7 +21236,8 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
2123621236
" 'is-hover': item.isHover,\n" +
2123721237
" 'mobile-nav-item-pf': item.isMobileItem && $ctrl.showMobileSecondary,\n" +
2123821238
" 'mobile-secondary-item-pf': item.isMobileItem && $ctrl.showMobileTertiary,\n" +
21239-
" 'visible-xs': item.mobileOnly}\" ng-mouseenter=$ctrl.handlePrimaryHover(item) ng-mouseleave=$ctrl.handlePrimaryUnHover(item)><a ng-click=\"$ctrl.handlePrimaryClick(item, $event)\"><span class={{item.iconClass}} ng-if=item.iconClass ng-class=\"{hidden: $ctrl.hiddenIcons}\" uib-tooltip={{item.title}} tooltip-append-to-body=true tooltip-enable={{$ctrl.navCollapsed}} tooltip-placement=bottom tooltip-class=nav-pf-vertical-tooltip></span> <span class=list-group-item-value>{{item.title}}</span><div ng-if=\"$ctrl.showBadges && item.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in item.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"item.children && item.children.length > 0\" class=nav-pf-secondary-nav><div class=nav-item-pf-header><a class=secondary-collapse-toggle-pf ng-click=\"$ctrl.collapseSecondaryNav(item, $event)\" ng-class=\"{'collapsed': item.secondaryCollapsed}\"></a> <span>{{item.title}}</span></div><ul class=list-group><li ng-repeat=\"secondaryItem in item.children\" class=list-group-item ng-class=\"{'tertiary-nav-item-pf': secondaryItem.children && secondaryItem.children.length > 0,\n" +
21239+
" 'hidden': item.mobileOnly && $ctrl.ignoreMobile,\n" +
21240+
" 'visible-xs': item.mobileOnly && !$ctrl.ignoreMobile}\" ng-mouseenter=$ctrl.handlePrimaryHover(item) ng-mouseleave=$ctrl.handlePrimaryUnHover(item)><a ng-click=\"$ctrl.handlePrimaryClick(item, $event)\"><span class={{item.iconClass}} ng-if=item.iconClass ng-class=\"{hidden: $ctrl.hiddenIcons}\" uib-tooltip={{item.title}} tooltip-append-to-body=true tooltip-enable={{$ctrl.navCollapsed}} tooltip-placement=bottom tooltip-class=nav-pf-vertical-tooltip></span> <span class=list-group-item-value>{{item.title}}</span><div ng-if=\"$ctrl.showBadges && item.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in item.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"item.children && item.children.length > 0\" class=nav-pf-secondary-nav><div class=nav-item-pf-header><a class=secondary-collapse-toggle-pf ng-click=\"$ctrl.collapseSecondaryNav(item, $event)\" ng-class=\"{'collapsed': item.secondaryCollapsed}\"></a> <span>{{item.title}}</span></div><ul class=list-group><li ng-repeat=\"secondaryItem in item.children\" class=list-group-item ng-class=\"{'tertiary-nav-item-pf': secondaryItem.children && secondaryItem.children.length > 0,\n" +
2124021241
" 'active': secondaryItem.isActive,\n" +
2124121242
" 'is-hover': secondaryItem.isHover,\n" +
2124221243
" 'mobile-nav-item-pf': secondaryItem.isMobileItem}\" ng-mouseenter=$ctrl.handleSecondaryHover(secondaryItem) ng-mouseleave=$ctrl.handleSecondaryUnHover(secondaryItem)><a ng-click=\"$ctrl.handleSecondaryClick(item, secondaryItem, $event)\"><span class=list-group-item-value>{{secondaryItem.title}}</span><div ng-if=\"$ctrl.showBadges && secondaryItem.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in secondaryItem.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"secondaryItem.children && secondaryItem.children.length > 0\" class=nav-pf-tertiary-nav><div class=nav-item-pf-header><a class=tertiary-collapse-toggle-pf ng-click=\"$ctrl.collapseTertiaryNav(secondaryItem, $event)\" ng-class=\"{'collapsed': secondaryItem.tertiaryCollapsed}\"></a> <span>{{secondaryItem.title}}</span></div><ul class=list-group><li ng-repeat=\"tertiaryItem in secondaryItem.children\" class=list-group-item ng-class=\"{'active': tertiaryItem.isActive}\"><a ng-click=\"$ctrl.handleTertiaryClick(item, secondaryItem, tertiaryItem, $event)\"><span class=list-group-item-value>{{tertiaryItem.title}}</span><div ng-if=\"$ctrl.showBadges && tertiaryItem.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in tertiaryItem.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a></li></ul></div></li></ul></div></li></ul></div></nav></div>"

‎dist/angular-patternfly.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/docs/css/angular-patternfly.css

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,3 +1276,33 @@ table.dataTable tbody td {
12761276
max-height: 70vh;
12771277
overflow-x: hidden;
12781278
}
1279+
.navbar-header.ignore-mobile {
1280+
float: left;
1281+
}
1282+
.navbar-collapse.ignore-mobile {
1283+
width: auto;
1284+
border-top: 0;
1285+
box-shadow: none;
1286+
display: block;
1287+
}
1288+
.navbar-collapse.ignore-mobile .navbar-nav {
1289+
float: left;
1290+
margin: 0;
1291+
}
1292+
.navbar-collapse.ignore-mobile .navbar-nav.navbar-right {
1293+
float: right;
1294+
}
1295+
.navbar-collapse.ignore-mobile .navbar-nav.navbar-right .dropdown-menu {
1296+
left: auto;
1297+
right: 0;
1298+
}
1299+
.navbar-collapse.ignore-mobile .navbar-nav > li {
1300+
float: left;
1301+
}
1302+
.navbar-collapse.ignore-mobile .navbar-nav .open .dropdown-menu {
1303+
position: absolute;
1304+
margin-top: 0;
1305+
background-color: #fff;
1306+
border: 1px solid #bbb;
1307+
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
1308+
}

‎dist/docs/css/patternfly.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9777,6 +9777,15 @@ h6 .label {
97779777
.modal-footer > .btn > .fa-angle-right {
97789778
margin-left: 5px;
97799779
}
9780+
.message-dialog-pf .modal-body {
9781+
display: -ms-flexbox;
9782+
display: flex;
9783+
}
9784+
.message-dialog-pf .modal-body .fa,
9785+
.message-dialog-pf .modal-body .pficon {
9786+
font-size: 30px;
9787+
margin-right: 15px;
9788+
}
97809789
.pager li > a,
97819790
.pager li > span {
97829791
background-color: #f1f1f1;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21217,7 +21217,7 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
2121721217

2121821218

2121921219
$templateCache.put('navigation/vertical-navigation.html',
21220-
"<div><nav class=\"navbar navbar-pf-vertical\"><div class=navbar-header><button type=button class=navbar-toggle ng-click=$ctrl.handleNavBarToggleClick()><span class=sr-only>Toggle navigation</span> <span class=icon-bar></span> <span class=icon-bar></span> <span class=icon-bar></span></button> <span class=navbar-brand><img class=navbar-brand-icon ng-if=$ctrl.brandSrc ng-src={{$ctrl.brandSrc}} alt=\"{{$ctrl.brandAlt}}\"> <span class=navbar-brand-txt ng-if=!$ctrl.brandSrc>{{$ctrl.brandAlt}}</span></span></div><nav class=\"collapse navbar-collapse\" ng-transclude></nav><div class=nav-pf-vertical ng-class=\"{'nav-pf-persistent-secondary': $ctrl.persistentSecondary,\n" +
21220+
"<div><nav class=\"navbar navbar-pf-vertical\"><div class=navbar-header ng-class=\"{'ignore-mobile': $ctrl.ignoreMobile}\"><button type=button class=navbar-toggle ng-click=$ctrl.handleNavBarToggleClick()><span class=sr-only>Toggle navigation</span> <span class=icon-bar></span> <span class=icon-bar></span> <span class=icon-bar></span></button> <span class=navbar-brand><img class=navbar-brand-icon ng-if=$ctrl.brandSrc ng-src={{$ctrl.brandSrc}} alt=\"{{$ctrl.brandAlt}}\"> <span class=navbar-brand-txt ng-if=!$ctrl.brandSrc>{{$ctrl.brandAlt}}</span></span></div><nav class=\"collapse navbar-collapse\" ng-class=\"{'ignore-mobile': $ctrl.ignoreMobile}\" ng-transclude></nav><div class=nav-pf-vertical ng-class=\"{'nav-pf-persistent-secondary': $ctrl.persistentSecondary,\n" +
2122121221
" 'nav-pf-vertical-collapsible-menus': $ctrl.pinnableMenus,\n" +
2122221222
" 'hidden-icons-pf': $ctrl.hiddenIcons,\n" +
2122321223
" 'nav-pf-vertical-with-badges': $ctrl.showBadges,\n" +
@@ -21236,7 +21236,8 @@ angular.module('patternfly.wizard').component('pfWizardSubstep', {
2123621236
" 'is-hover': item.isHover,\n" +
2123721237
" 'mobile-nav-item-pf': item.isMobileItem && $ctrl.showMobileSecondary,\n" +
2123821238
" 'mobile-secondary-item-pf': item.isMobileItem && $ctrl.showMobileTertiary,\n" +
21239-
" 'visible-xs': item.mobileOnly}\" ng-mouseenter=$ctrl.handlePrimaryHover(item) ng-mouseleave=$ctrl.handlePrimaryUnHover(item)><a ng-click=\"$ctrl.handlePrimaryClick(item, $event)\"><span class={{item.iconClass}} ng-if=item.iconClass ng-class=\"{hidden: $ctrl.hiddenIcons}\" uib-tooltip={{item.title}} tooltip-append-to-body=true tooltip-enable={{$ctrl.navCollapsed}} tooltip-placement=bottom tooltip-class=nav-pf-vertical-tooltip></span> <span class=list-group-item-value>{{item.title}}</span><div ng-if=\"$ctrl.showBadges && item.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in item.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"item.children && item.children.length > 0\" class=nav-pf-secondary-nav><div class=nav-item-pf-header><a class=secondary-collapse-toggle-pf ng-click=\"$ctrl.collapseSecondaryNav(item, $event)\" ng-class=\"{'collapsed': item.secondaryCollapsed}\"></a> <span>{{item.title}}</span></div><ul class=list-group><li ng-repeat=\"secondaryItem in item.children\" class=list-group-item ng-class=\"{'tertiary-nav-item-pf': secondaryItem.children && secondaryItem.children.length > 0,\n" +
21239+
" 'hidden': item.mobileOnly && $ctrl.ignoreMobile,\n" +
21240+
" 'visible-xs': item.mobileOnly && !$ctrl.ignoreMobile}\" ng-mouseenter=$ctrl.handlePrimaryHover(item) ng-mouseleave=$ctrl.handlePrimaryUnHover(item)><a ng-click=\"$ctrl.handlePrimaryClick(item, $event)\"><span class={{item.iconClass}} ng-if=item.iconClass ng-class=\"{hidden: $ctrl.hiddenIcons}\" uib-tooltip={{item.title}} tooltip-append-to-body=true tooltip-enable={{$ctrl.navCollapsed}} tooltip-placement=bottom tooltip-class=nav-pf-vertical-tooltip></span> <span class=list-group-item-value>{{item.title}}</span><div ng-if=\"$ctrl.showBadges && item.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in item.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"item.children && item.children.length > 0\" class=nav-pf-secondary-nav><div class=nav-item-pf-header><a class=secondary-collapse-toggle-pf ng-click=\"$ctrl.collapseSecondaryNav(item, $event)\" ng-class=\"{'collapsed': item.secondaryCollapsed}\"></a> <span>{{item.title}}</span></div><ul class=list-group><li ng-repeat=\"secondaryItem in item.children\" class=list-group-item ng-class=\"{'tertiary-nav-item-pf': secondaryItem.children && secondaryItem.children.length > 0,\n" +
2124021241
" 'active': secondaryItem.isActive,\n" +
2124121242
" 'is-hover': secondaryItem.isHover,\n" +
2124221243
" 'mobile-nav-item-pf': secondaryItem.isMobileItem}\" ng-mouseenter=$ctrl.handleSecondaryHover(secondaryItem) ng-mouseleave=$ctrl.handleSecondaryUnHover(secondaryItem)><a ng-click=\"$ctrl.handleSecondaryClick(item, secondaryItem, $event)\"><span class=list-group-item-value>{{secondaryItem.title}}</span><div ng-if=\"$ctrl.showBadges && secondaryItem.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in secondaryItem.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a><div ng-if=\"secondaryItem.children && secondaryItem.children.length > 0\" class=nav-pf-tertiary-nav><div class=nav-item-pf-header><a class=tertiary-collapse-toggle-pf ng-click=\"$ctrl.collapseTertiaryNav(secondaryItem, $event)\" ng-class=\"{'collapsed': secondaryItem.tertiaryCollapsed}\"></a> <span>{{secondaryItem.title}}</span></div><ul class=list-group><li ng-repeat=\"tertiaryItem in secondaryItem.children\" class=list-group-item ng-class=\"{'active': tertiaryItem.isActive}\"><a ng-click=\"$ctrl.handleTertiaryClick(item, secondaryItem, tertiaryItem, $event)\"><span class=list-group-item-value>{{tertiaryItem.title}}</span><div ng-if=\"$ctrl.showBadges && tertiaryItem.badges\" class=badge-container-pf><div class=\"badge {{badge.badgeClass}}\" ng-repeat=\"badge in tertiaryItem.badges\" uib-tooltip={{badge.tooltip}} tooltip-append-to-body=true tooltip-placement=right><span ng-if=\"badge.count && badge.iconClass\" class={{badge.iconClass}}></span> <span ng-if=badge.count>{{badge.count}}</span></div></div></a></li></ul></div></li></ul></div></li></ul></div></nav></div>"

‎dist/docs/grunt-scripts/dataTables.select.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
/*! Select for DataTables 1.2.5-dev
2-
* 2015-2017 SpryMedia Ltd - datatables.net/license/mit
1+
/*! Select for DataTables 1.2.6
2+
* 2015-2018 SpryMedia Ltd - datatables.net/license/mit
33
*/
44

55
/**
66
* @summary Select for DataTables
77
* @description A collection of API methods, events and buttons for DataTables
88
* that provides selection options of the items in a DataTable
9-
* @version 1.2.5-dev
9+
* @version 1.2.6
1010
* @file dataTables.select.js
1111
* @author SpryMedia Ltd (www.sprymedia.co.uk)
1212
* @contact datatables.net/forums
13-
* @copyright Copyright 2015-2017 SpryMedia Ltd.
13+
* @copyright Copyright 2015-2018 SpryMedia Ltd.
1414
*
1515
* This source file is free software, available under the following license:
1616
* MIT license - http://datatables.net/license/mit
@@ -54,7 +54,7 @@ var DataTable = $.fn.dataTable;
5454
// Version information for debugger
5555
DataTable.select = {};
5656

57-
DataTable.select.version = '1.2.5-dev';
57+
DataTable.select.version = '1.2.6';
5858

5959
DataTable.select.init = function ( dt ) {
6060
var ctx = dt.settings()[0];
@@ -324,6 +324,7 @@ function enableMouseSelection ( dt )
324324
var container = $( dt.table().container() );
325325
var ctx = dt.settings()[0];
326326
var selector = ctx._select.selector;
327+
var matchSelection;
327328

328329
container
329330
.on( 'mousedown.dtSelect', selector, function(e) {
@@ -336,6 +337,10 @@ function enableMouseSelection ( dt )
336337
return false;
337338
} );
338339
}
340+
341+
if ( window.getSelection ) {
342+
matchSelection = window.getSelection();
343+
}
339344
} )
340345
.on( 'mouseup.dtSelect', selector, function() {
341346
// Allow text selection to occur again, Mozilla style (tested in FF
@@ -354,16 +359,17 @@ function enableMouseSelection ( dt )
354359
// If the element that contains the selection is not in the table, we can ignore it
355360
// This can happen if the developer selects text from the click event
356361
if ( ! selection.anchorNode || $(selection.anchorNode).closest('table')[0] === dt.table().node() ) {
357-
if ( $.trim(selection.toString()) !== '' ) {
362+
if ( selection !== matchSelection ) {
358363
return;
359364
}
360365
}
361366
}
362367

363368
var ctx = dt.settings()[0];
369+
var wrapperClass = dt.settings()[0].oClasses.sWrapper.replace(/ /g, '.');
364370

365371
// Ignore clicks inside a sub-table
366-
if ( $(e.target).closest('div.dataTables_wrapper')[0] != dt.table().container() ) {
372+
if ( $(e.target).closest('div.'+wrapperClass)[0] != dt.table().container() ) {
367373
return;
368374
}
369375

0 commit comments

Comments
 (0)