Skip to content

Commit f560428

Browse files
patternfly-buildpatternfly-build
committed
Merge branch '_bump_dev-v4.0.0-alpha.1-local' into branch-4.0-dev-dist
2 parents 6d81a40 + 3b1b744 commit f560428

File tree

74 files changed

+1264
-6445
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

+1264
-6445
lines changed

‎README.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,38 @@ Note:
8989
'patternfly.charts'
9090
]);
9191

92+
### Using with Webpack
93+
94+
In order to use Angular-Patternfly in a Webpack-bundled application there are some things you need to keep in mind:
95+
96+
#### Create an alias for the jQuery module
97+
98+
In order to let Webpack find the correct jQuery module when assembling all the dependencies you need to create an alias for it in the webpack.conf.js file:
99+
100+
```
101+
...
102+
resolve: {
103+
alias: {
104+
"jquery": "angular-patternfly/node_modules/patternfly/node_modules/jquery"
105+
}
106+
}
107+
...
108+
```
109+
110+
Additionally, you have to use the `webpack.ProvidePlugin` so the $ and the jQuery variables are added to the `window` object, making them available to the other modules (Patternfly included):
111+
```
112+
...
113+
plugins: [
114+
new webpack.ProvidePlugin({
115+
$: "jquery",
116+
jQuery: "jquery",
117+
"window.jQuery": "jquery",
118+
"window.jquery": "jquery"
119+
})
120+
]
121+
...
122+
```
123+
92124
## API documentation
93125

94126
The API documentation can be built with:

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "3.16.0",
3+
"version": "4.0.0-alpha.1",
44
"authors": [
55
"Red Hat"
66
],
@@ -45,10 +45,10 @@
4545
"angular-datatables": "^0.5.6",
4646
"datatables.net": "^1.10.12",
4747
"datatables.net-select": "~1.2.0",
48-
"patternfly": "~3.15.0"
48+
"patternfly": "~4.0.0-alpha.1"
4949
},
5050
"devDependencies": {
5151
"angular-mocks": "1.5.*",
52-
"angular-ui-router": "^0.3.2"
52+
"angular-ui-router": "^1.0.0-beta.3"
5353
}
5454
}

‎dist/angular-patternfly.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4642,6 +4642,8 @@ angular.module('patternfly.modals')
46424642
* <li>.tooltip - (string) Tooltip to display for the badge
46434643
* <li>.badgeClass: - (string) Additional class(es) to add to the badge container
46444644
* </ul>
4645+
* <li>.uiSref - (string) Optional Angular UI Router state name. If specified, href must be not defined, and vice versa.
4646+
* <li>.uiSrefOptions - (object) Optional object to be passed to Angular UI Router $state.go() function
46454647
* </ul>
46464648
* @param {function} navigateCallback function(item) Callback method invoked on a navigation item click (one with no submenus)
46474649
* @param {function} itemClickCallback function(item) Callback method invoked on an item click
@@ -4749,7 +4751,8 @@ angular.module('patternfly.modals')
47494751
{
47504752
title: "Dashboard",
47514753
iconClass: "fa fa-dashboard",
4752-
uiSref: "dashboard"
4754+
uiSref: "dashboard",
4755+
uiSrefOptions: { someKey: 'SomeValue' }
47534756
},
47544757
{
47554758
title: "Dolor",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ accordion > .panel-group .panel-open .panel-title > a:before {
467467
}
468468

469469
.pf-expand-placeholder {
470-
margin-right: 10px;
470+
margin-right: 15px;
471471
}
472472

473473
pf-c3-chart {

‎dist/docs/css/examples.css‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ hr {
6060
padding-top: 2px;
6161
}
6262

63-
.list-view-container span {
64-
padding-left: 5px;
65-
}
66-
67-
.list-view-container .fa {
68-
padding-left: 0px;
69-
}
70-
7163
.card-view-container {
7264
border: 1px solid #000000;
7365
margin: 10px;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,7 +2557,6 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
25572557
border: 2px solid transparent;
25582558
}
25592559
.card-pf-view .card-pf-heading-kebab .dropdown-kebab-pf {
2560-
margin-left: 10px;
25612560
margin-top: -3px;
25622561
}
25632562
.card-pf-view .card-pf-heading-kebab + .progress-pf-legend p {
@@ -2751,6 +2750,8 @@ fieldset[disabled] .combobox-container .input-group-addon.active {
27512750
}
27522751
.close {
27532752
text-shadow: none;
2753+
z-index: 1;
2754+
position: relative;
27542755
opacity: 0.6;
27552756
filter: alpha(opacity=60);
27562757
}
@@ -3502,7 +3503,8 @@ a.disabled {
35023503
order: 2;
35033504
}
35043505
.list-view-pf-actions button,
3505-
.list-view-pf-actions > a {
3506+
.list-view-pf-actions > a,
3507+
.list-view-pf-actions .dropdown-kebab-pf {
35063508
margin-left: 10px;
35073509
}
35083510
.list-view-pf-top-align .list-view-pf-actions {
@@ -3602,6 +3604,8 @@ a.disabled {
36023604
}
36033605
.list-view-pf-stacked .list-view-pf-description {
36043606
display: block;
3607+
-ms-flex: none;
3608+
flex: none;
36053609
}
36063610
@media (min-width: 992px) {
36073611
.list-view-pf-description {
@@ -5567,6 +5571,11 @@ table.dataTable th:active {
55675571
.toolbar-pf .form-group .btn-link:hover {
55685572
color: #0088ce;
55695573
}
5574+
.toolbar-pf .form-group .dropdown-kebab-pf .btn-link {
5575+
padding: 4px 10px;
5576+
margin-left: -10px;
5577+
margin-right: -10px;
5578+
}
55705579
.toolbar-pf-actions {
55715580
display: table;
55725581
margin-bottom: 10px;

‎dist/docs/css/patternfly.css‎

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9260,7 +9260,9 @@ fieldset[disabled] .btn-primary.active {
92609260
color: #252525;
92619261
font-size: 16px;
92629262
line-height: 1;
9263-
padding: 4px 0;
9263+
padding: 4px 10px;
9264+
margin-left: -10px;
9265+
margin-right: -10px;
92649266
}
92659267
.dropdown-kebab-pf .btn-link:active,
92669268
.dropdown-kebab-pf .btn-link:focus,
@@ -9744,6 +9746,68 @@ fieldset[disabled] .pagination > li > span.active {
97449746
font-size: 12px;
97459747
margin-top: 2px;
97469748
}
9749+
.content-view-pf-pagination {
9750+
background-color: #f5f5f5;
9751+
border: 1px solid #d1d1d1;
9752+
border-top: none;
9753+
display: -ms-flexbox;
9754+
display: flex;
9755+
-ms-flex-wrap: wrap;
9756+
flex-wrap: wrap;
9757+
-ms-flex-pack: justify;
9758+
justify-content: space-between;
9759+
}
9760+
.content-view-pf-pagination .form-group {
9761+
-ms-flex-align: baseline;
9762+
align-items: baseline;
9763+
display: -ms-flexbox;
9764+
display: flex;
9765+
-ms-flex-positive: 1;
9766+
flex-grow: 1;
9767+
float: left;
9768+
margin: 5px;
9769+
}
9770+
@supports (display: flex) {
9771+
.content-view-pf-pagination .form-group {
9772+
float: none;
9773+
}
9774+
}
9775+
.content-view-pf-pagination .form-group:last-child {
9776+
-ms-flex-pack: end;
9777+
justify-content: flex-end;
9778+
float: right;
9779+
}
9780+
@supports (display: flex) {
9781+
.content-view-pf-pagination .form-group:last-child {
9782+
float: none;
9783+
}
9784+
}
9785+
.content-view-pf-pagination .form-group .pagination-pf-pagesize.bootstrap-select.btn-group {
9786+
display: -ms-flexbox;
9787+
display: flex;
9788+
margin-right: 5px;
9789+
width: auto;
9790+
}
9791+
.content-view-pf-pagination .pagination-pf-page {
9792+
margin-left: 10px;
9793+
margin-right: 5px;
9794+
padding: 0 2px 2px;
9795+
text-align: right;
9796+
width: 2.5em;
9797+
}
9798+
.content-view-pf-pagination .pagination {
9799+
display: -ms-flexbox;
9800+
display: flex;
9801+
margin: 0 0 0 10px;
9802+
}
9803+
.content-view-pf-pagination .pagination a {
9804+
float: none;
9805+
}
9806+
@supports (display: flex) {
9807+
.content-view-pf-pagination .pagination a {
9808+
display: block;
9809+
}
9810+
}
97479811
.panel-title {
97489812
font-weight: 700;
97499813
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license AngularJS v1.5.9
3-
* (c) 2010-2016 Google, Inc. http://angularjs.org
2+
* @license AngularJS v1.5.11
3+
* (c) 2010-2017 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
66
(function(window, angular) {'use strict';
@@ -423,7 +423,7 @@ var $$rAFSchedulerFactory = ['$$rAF', function($$rAF) {
423423
* of the children's parents are currently animating. By default, when an element has an active `enter`, `leave`, or `move`
424424
* (structural) animation, child elements that also have an active structural animation are not animated.
425425
*
426-
* Note that even if `ngAnimteChildren` is set, no child animations will run when the parent element is removed from the DOM (`leave` animation).
426+
* Note that even if `ngAnimateChildren` is set, no child animations will run when the parent element is removed from the DOM (`leave` animation).
427427
*
428428
*
429429
* @param {string} ngAnimateChildren If the value is empty, `true` or `on`,
@@ -3415,7 +3415,7 @@ var ngAnimateSwapDirective = ['$animate', '$rootScope', function($animate, $root
34153415
* ## CSS-based Animations
34163416
*
34173417
* CSS-based animations with ngAnimate are unique since they require no JavaScript code at all. By using a CSS class that we reference between our HTML
3418-
* and CSS code we can create an animation that will be picked up by Angular when an the underlying directive performs an operation.
3418+
* and CSS code we can create an animation that will be picked up by Angular when an underlying directive performs an operation.
34193419
*
34203420
* The example below shows how an `enter` animation can be made possible on an element using `ng-if`:
34213421
*

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4642,6 +4642,8 @@ angular.module('patternfly.modals')
46424642
* <li>.tooltip - (string) Tooltip to display for the badge
46434643
* <li>.badgeClass: - (string) Additional class(es) to add to the badge container
46444644
* </ul>
4645+
* <li>.uiSref - (string) Optional Angular UI Router state name. If specified, href must be not defined, and vice versa.
4646+
* <li>.uiSrefOptions - (object) Optional object to be passed to Angular UI Router $state.go() function
46454647
* </ul>
46464648
* @param {function} navigateCallback function(item) Callback method invoked on a navigation item click (one with no submenus)
46474649
* @param {function} itemClickCallback function(item) Callback method invoked on an item click
@@ -4749,7 +4751,8 @@ angular.module('patternfly.modals')
47494751
{
47504752
title: "Dashboard",
47514753
iconClass: "fa fa-dashboard",
4752-
uiSref: "dashboard"
4754+
uiSref: "dashboard",
4755+
uiSrefOptions: { someKey: 'SomeValue' }
47534756
},
47544757
{
47554758
title: "Dolor",

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license AngularJS v1.5.9
3-
* (c) 2010-2016 Google, Inc. http://angularjs.org
2+
* @license AngularJS v1.5.11
3+
* (c) 2010-2017 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
66
(function(window, angular) {'use strict';
@@ -504,27 +504,26 @@ function $SanitizeProvider() {
504504
* @param node Root element to process
505505
*/
506506
function stripCustomNsAttrs(node) {
507-
if (node.nodeType === window.Node.ELEMENT_NODE) {
508-
var attrs = node.attributes;
509-
for (var i = 0, l = attrs.length; i < l; i++) {
510-
var attrNode = attrs[i];
511-
var attrName = attrNode.name.toLowerCase();
512-
if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
513-
node.removeAttributeNode(attrNode);
514-
i--;
515-
l--;
507+
while (node) {
508+
if (node.nodeType === window.Node.ELEMENT_NODE) {
509+
var attrs = node.attributes;
510+
for (var i = 0, l = attrs.length; i < l; i++) {
511+
var attrNode = attrs[i];
512+
var attrName = attrNode.name.toLowerCase();
513+
if (attrName === 'xmlns:ns1' || attrName.lastIndexOf('ns1:', 0) === 0) {
514+
node.removeAttributeNode(attrNode);
515+
i--;
516+
l--;
517+
}
516518
}
517519
}
518-
}
519520

520-
var nextNode = node.firstChild;
521-
if (nextNode) {
522-
stripCustomNsAttrs(nextNode);
523-
}
521+
var nextNode = node.firstChild;
522+
if (nextNode) {
523+
stripCustomNsAttrs(nextNode);
524+
}
524525

525-
nextNode = node.nextSibling;
526-
if (nextNode) {
527-
stripCustomNsAttrs(nextNode);
526+
node = node.nextSibling;
528527
}
529528
}
530529
}

0 commit comments

Comments
 (0)