Skip to content

Commit

Permalink
chore(angular): upgrade to angular v1.3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed Feb 11, 2015
1 parent eef1d32 commit c0b0d78
Show file tree
Hide file tree
Showing 21 changed files with 4,069 additions and 3,889 deletions.
5 changes: 2 additions & 3 deletions config/lib/js/angular/angular-animate.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.3.11
* @license AngularJS v1.3.13
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -1333,8 +1333,7 @@ angular.module('ngAnimate', ['ng'])
} else if (lastAnimation.event == 'setClass') {
animationsToCancel.push(lastAnimation);
cleanup(element, className);
}
else if (runningAnimations[className]) {
} else if (runningAnimations[className]) {
var current = runningAnimations[className];
if (current.event == animationEvent) {
skipAnimation = true;
Expand Down
2 changes: 1 addition & 1 deletion config/lib/js/angular/angular-animate.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/lib/js/angular/angular-animate.min.js.map

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions config/lib/js/angular/angular-aria.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license AngularJS v1.3.11
* @license AngularJS v1.3.13
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
Expand Down Expand Up @@ -105,7 +105,8 @@ function $AriaProvider() {
* - **ariaMultiline** – `{boolean}` – Enables/disables aria-multiline tags
* - **ariaValue** – `{boolean}` – Enables/disables aria-valuemin, aria-valuemax and aria-valuenow tags
* - **tabindex** – `{boolean}` – Enables/disables tabindex tags
* - **bindKeypress** – `{boolean}` – Enables/disables keypress event binding on ng-click
* - **bindKeypress** – `{boolean}` – Enables/disables keypress event binding on `<div>` and
* `<li>` elements with ng-click
*
* @description
* Enables/disables various ARIA attributes
Expand Down Expand Up @@ -308,11 +309,18 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
compile: function(elem, attr) {
var fn = $parse(attr.ngClick, /* interceptorFn */ null, /* expensiveChecks */ true);
return function(scope, elem, attr) {

function isNodeOneOf(elem, nodeTypeArray) {
if (nodeTypeArray.indexOf(elem[0].nodeName) !== -1) {
return true;
}
}

if ($aria.config('tabindex') && !elem.attr('tabindex')) {
elem.attr('tabindex', 0);
}

if ($aria.config('bindKeypress') && !attr.ngKeypress) {
if ($aria.config('bindKeypress') && !attr.ngKeypress && isNodeOneOf(elem, ['DIV', 'LI'])) {
elem.on('keypress', function(event) {
if (event.keyCode === 32 || event.keyCode === 13) {
scope.$apply(callback);
Expand Down
14 changes: 7 additions & 7 deletions config/lib/js/angular/angular-aria.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c0b0d78

Please sign in to comment.