Skip to content

Commit

Permalink
Upgraded to Angular 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mlynch committed Nov 29, 2013
1 parent eebfbb4 commit a4823f1
Show file tree
Hide file tree
Showing 27 changed files with 833 additions and 640 deletions.
4 changes: 4 additions & 0 deletions dist/css/ionic.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@charset "UTF-8";
/*!
* Copyright 2013 Drifty Co.
* http://drifty.com/
Expand Down Expand Up @@ -5815,6 +5816,9 @@ a.button {
.show {
display: block; }

.invisible {
visibility: hidden; }

.inline {
display: inline-block; }

Expand Down
1 change: 1 addition & 0 deletions dist/css/themes/ionic-ios7.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@charset "UTF-8";
/*!
* Copyright 2013 Drifty Co.
* http://drifty.com/
Expand Down
25 changes: 18 additions & 7 deletions dist/js/angular/angular-animate.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license AngularJS v1.2.2
* (c) 2010-2012 Google, Inc. http://angularjs.org
* @license AngularJS v1.2.3
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
(function(window, angular, undefined) {'use strict';
Expand Down Expand Up @@ -269,9 +269,16 @@ angular.module('ngAnimate', ['ng'])

$rootElement.data(NG_ANIMATE_STATE, rootAnimateState);

// disable animations during bootstrap, but once we bootstrapped, enable animations
// disable animations during bootstrap, but once we bootstrapped, wait again
// for another digest until enabling animations. The reason why we digest twice
// is because all structural animations (enter, leave and move) all perform a
// post digest operation before animating. If we only wait for a single digest
// to pass then the structural animation would render its animation on page load.
// (which is what we're trying to avoid when the application first boots up.)
$rootScope.$$postDigest(function() {
rootAnimateState.running = false;
$rootScope.$$postDigest(function() {
rootAnimateState.running = false;
});
});

function lookup(name) {
Expand Down Expand Up @@ -1038,7 +1045,10 @@ angular.module('ngAnimate', ['ng'])
}

function unblockKeyframeAnimations(element) {
element[0].style[ANIMATION_PROP] = '';
var node = element[0], prop = ANIMATION_PROP;
if(node.style[prop] && node.style[prop].length > 0) {
element[0].style[prop] = '';
}
}

function animateRun(element, className, activeAnimationComplete) {
Expand Down Expand Up @@ -1069,8 +1079,6 @@ angular.module('ngAnimate', ['ng'])
appliedStyles.push(CSS_PREFIX + 'transition-property');
appliedStyles.push(CSS_PREFIX + 'transition-duration');
}
} else {
unblockKeyframeAnimations(element);
}

if(ii > 0) {
Expand Down Expand Up @@ -1173,6 +1181,7 @@ angular.module('ngAnimate', ['ng'])
var cancel = preReflowCancellation;
afterReflow(function() {
unblockTransitions(element);
unblockKeyframeAnimations(element);
//once the reflow is complete then we point cancel to
//the new cancellation function which will remove all of the
//animation properties from the active animation
Expand Down Expand Up @@ -1238,6 +1247,7 @@ angular.module('ngAnimate', ['ng'])
if(cancellationMethod) {
afterReflow(function() {
unblockTransitions(element);
unblockKeyframeAnimations(element);
animationCompleted();
});
return cancellationMethod;
Expand All @@ -1254,6 +1264,7 @@ angular.module('ngAnimate', ['ng'])
if(cancellationMethod) {
afterReflow(function() {
unblockTransitions(element);
unblockKeyframeAnimations(element);
animationCompleted();
});
return cancellationMethod;
Expand Down
36 changes: 18 additions & 18 deletions dist/js/angular/angular-animate.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/angular/angular-animate.min.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/angular/angular-cookies.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license AngularJS v1.2.2
* (c) 2010-2012 Google, Inc. http://angularjs.org
* @license AngularJS v1.2.3
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
(function(window, angular, undefined) {'use strict';
Expand Down
4 changes: 2 additions & 2 deletions dist/js/angular/angular-cookies.min.js

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

6 changes: 3 additions & 3 deletions dist/js/angular/angular-loader.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license AngularJS v1.2.2
* (c) 2010-2012 Google, Inc. http://angularjs.org
* @license AngularJS v1.2.3
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/

Expand Down Expand Up @@ -69,7 +69,7 @@ function minErr(module) {
return match;
});

message = message + '\nhttp://errors.angularjs.org/1.2.2/' +
message = message + '\nhttp://errors.angularjs.org/1.2.3/' +
(module ? module + '/' : '') + code;
for (i = 2; i < arguments.length; i++) {
message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +
Expand Down
6 changes: 3 additions & 3 deletions dist/js/angular/angular-loader.min.js

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

Loading

0 comments on commit a4823f1

Please sign in to comment.