Skip to content

Commit 495f2ad

Browse files
hiravgandhihiravgandhi
committed
Bump version to 1.4.3
1 parent 7294d0f commit 495f2ad

15 files changed

+12233
-11293
lines changed

‎lib/angularjs-rails/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module AngularJS
22
module Rails
3-
VERSION = "1.4.2"
4-
UNSTABLE_VERSION = "2.0.0-alpha.28"
3+
VERSION = "1.4.3"
4+
UNSTABLE_VERSION = "2.0.0-alpha.31"
55
end
66
end

‎vendor/assets/javascripts/angular-animate.js

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -514,7 +514,7 @@ var $$AnimateChildrenDirective = [function() {
514514
* to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.)
515515
* * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both).
516516
* * `transition` - The raw CSS transition style that will be used (e.g. `1s linear all`).
517-
* * `keyframe` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
517+
* * `keyframeStyle` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
518518
* * `from` - The starting CSS styles (a key/value object) that will be applied at the start of the animation.
519519
* * `to` - The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition.
520520
* * `addClass` - A space separated list of CSS classes that will be added to the element and spread across the animation.
@@ -825,6 +825,10 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
825825

826826
function init(element, options) {
827827
var node = getDomNode(element);
828+
if (!node || !node.parentNode) {
829+
return closeAndReturnNoopAnimator();
830+
}
831+
828832
options = prepareAnimationOptions(options);
829833

830834
var temporaryStyles = [];
@@ -884,10 +888,14 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
884888
var fullClassName = classes + ' ' + setupClasses;
885889
var activeClasses = pendClasses(setupClasses, '-active');
886890
var hasToStyles = styles.to && Object.keys(styles.to).length > 0;
887-
888-
// there is no way we can trigger an animation since no styles and
889-
// no classes are being applied which would then trigger a transition
890-
if (!hasToStyles && !setupClasses) {
891+
var containsKeyframeAnimation = (options.keyframeStyle || '').length > 0;
892+
893+
// there is no way we can trigger an animation if no styles and
894+
// no classes are being applied which would then trigger a transition,
895+
// unless there a is raw keyframe value that is applied to the element.
896+
if (!containsKeyframeAnimation
897+
&& !hasToStyles
898+
&& !setupClasses) {
891899
return closeAndReturnNoopAnimator();
892900
}
893901

@@ -1110,6 +1118,10 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
11101118

11111119
function start() {
11121120
if (animationClosed) return;
1121+
if (!node.parentNode) {
1122+
close();
1123+
return;
1124+
}
11131125

11141126
var startTime, events = [];
11151127

@@ -2747,7 +2759,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
27472759
? (animationEntry.from.element || animationEntry.to.element)
27482760
: animationEntry.element;
27492761

2750-
if (getRunner(targetElement)) {
2762+
if (getRunner(targetElement) && getDomNode(targetElement).parentNode) {
27512763
var operation = invokeFirstDriver(animationEntry);
27522764
if (operation) {
27532765
startAnimationFn = operation.start;

‎vendor/assets/javascripts/angular-aria.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎vendor/assets/javascripts/angular-cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎vendor/assets/javascripts/angular-loader.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
66

77
(function() {'use strict';
8+
function isFunction(value) {return typeof value === 'function';};
89

910
/**
1011
* @description
@@ -58,7 +59,7 @@ function minErr(module, ErrorConstructor) {
5859
return match;
5960
});
6061

61-
message += '\nhttp://errors.angularjs.org/1.4.2/' +
62+
message += '\nhttp://errors.angularjs.org/1.4.3/' +
6263
(module ? module + '/' : '') + code;
6364

6465
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {

‎vendor/assets/javascripts/angular-message-format.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎vendor/assets/javascripts/angular-messages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎vendor/assets/javascripts/angular-mocks.js

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -771,15 +771,14 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
771771
};
772772
});
773773

774-
$provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', '$$rAF',
775-
function($delegate, $$asyncCallback, $timeout, $browser, $$rAF) {
774+
$provide.decorator('$animate', ['$delegate', '$timeout', '$browser', '$$rAF',
775+
function($delegate, $timeout, $browser, $$rAF) {
776776
var animate = {
777777
queue: [],
778778
cancel: $delegate.cancel,
779779
enabled: $delegate.enabled,
780780
triggerCallbackEvents: function() {
781781
$$rAF.flush();
782-
$$asyncCallback.flush();
783782
},
784783
triggerCallbackPromise: function() {
785784
$timeout.flush(0);
@@ -1771,20 +1770,6 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) {
17711770
return rafFn;
17721771
}];
17731772

1774-
angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) {
1775-
var callbacks = [];
1776-
var addFn = function(fn) {
1777-
callbacks.push(fn);
1778-
};
1779-
addFn.flush = function() {
1780-
angular.forEach(callbacks, function(fn) {
1781-
fn();
1782-
});
1783-
callbacks = [];
1784-
};
1785-
return addFn;
1786-
}];
1787-
17881773
/**
17891774
*
17901775
*/
@@ -1891,7 +1876,6 @@ angular.module('ngMock', ['ng']).provider({
18911876
}).config(['$provide', function($provide) {
18921877
$provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
18931878
$provide.decorator('$$rAF', angular.mock.$RAFDecorator);
1894-
$provide.decorator('$$asyncCallback', angular.mock.$AsyncCallbackDecorator);
18951879
$provide.decorator('$rootScope', angular.mock.$RootScopeDecorator);
18961880
$provide.decorator('$controller', angular.mock.$ControllerDecorator);
18971881
}]);

‎vendor/assets/javascripts/angular-resource.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

‎vendor/assets/javascripts/angular-route.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.2
2+
* @license AngularJS v1.4.3
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -412,7 +412,9 @@ function $RouteProvider() {
412412
* @name $route#$routeChangeSuccess
413413
* @eventType broadcast on root scope
414414
* @description
415-
* Broadcasted after a route dependencies are resolved.
415+
* Broadcasted after a route change has happened successfully.
416+
* The `resolve` dependencies are now available in the `current.locals` property.
417+
*
416418
* {@link ngRoute.directive:ngView ngView} listens for the directive
417419
* to instantiate the controller and render the view.
418420
*

0 commit comments

Comments
 (0)