Skip to content

Commit f770a3c

Browse files
Merge branch 'master-local' into master-dist
2 parents 699d84f + ea08554 commit f770a3c

File tree

52 files changed

+581
-405
lines changed

Some content is hidden

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

52 files changed

+581
-405
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
},
4747
"devDependencies": {
4848
"angular-mocks": "1.3.0 - 1.5.*",
49-
"angular-ui-router": "^0.3.2"
49+
"angular-ui-router": "1.0.0-beta.3"
5050
}
5151
}

dist/angular-patternfly.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4506,6 +4506,8 @@ angular.module('patternfly.modals')
45064506
* <li>.tooltip - (string) Tooltip to display for the badge
45074507
* <li>.badgeClass: - (string) Additional class(es) to add to the badge container
45084508
* </ul>
4509+
* <li>.uiSref - (string) Optional Angular UI Router state name. If specified, href must be not defined, and vice versa.
4510+
* <li>.uiSrefOptions - (object) Optional object to be passed to Angular UI Router $state.go() function
45094511
* </ul>
45104512
* @param {function} navigateCallback function(item) Callback method invoked on a navigation item click (one with no submenus)
45114513
* @param {function} itemClickCallback function(item) Callback method invoked on an item click
@@ -4604,7 +4606,8 @@ angular.module('patternfly.modals')
46044606
{
46054607
title: "Dashboard",
46064608
iconClass: "fa fa-dashboard",
4607-
uiSref: "dashboard"
4609+
uiSref: "dashboard",
4610+
uiSrefOptions: { someKey: 'SomeValue' }
46084611
},
46094612
{
46104613
title: "Dolor",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.9
2+
* @license AngularJS v1.5.10
33
* (c) 2010-2016 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -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
@@ -4506,6 +4506,8 @@ angular.module('patternfly.modals')
45064506
* <li>.tooltip - (string) Tooltip to display for the badge
45074507
* <li>.badgeClass: - (string) Additional class(es) to add to the badge container
45084508
* </ul>
4509+
* <li>.uiSref - (string) Optional Angular UI Router state name. If specified, href must be not defined, and vice versa.
4510+
* <li>.uiSrefOptions - (object) Optional object to be passed to Angular UI Router $state.go() function
45094511
* </ul>
45104512
* @param {function} navigateCallback function(item) Callback method invoked on a navigation item click (one with no submenus)
45114513
* @param {function} itemClickCallback function(item) Callback method invoked on an item click
@@ -4604,7 +4606,8 @@ angular.module('patternfly.modals')
46044606
{
46054607
title: "Dashboard",
46064608
iconClass: "fa fa-dashboard",
4607-
uiSref: "dashboard"
4609+
uiSref: "dashboard",
4610+
uiSrefOptions: { someKey: 'SomeValue' }
46084611
},
46094612
{
46104613
title: "Dolor",

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.9
2+
* @license AngularJS v1.5.10
33
* (c) 2010-2016 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -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
}

dist/docs/grunt-scripts/angular-ui-router.min.js

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

0 commit comments

Comments
 (0)