Skip to content

Commit b981c18

Browse files
committed
Merge branch 'v0.2'
Conflicts: modules/ngMeteor-template.js smart.json
2 parents 20b97a0 + 0d6bbbd commit b981c18

17 files changed

+3094
-1501
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@
3535
.Trashes
3636
ehthumbs.db
3737
Thumbs.db
38-
.build*
38+
.build*
39+
smart.json
40+
smart.lock
41+
packages

README.md

+82-288
Large diffs are not rendered by default.

lib/angular-animate.js

+253-233
Large diffs are not rendered by default.

lib/angular-cookies.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.2.14
2+
* @license AngularJS v1.3.0-beta.7
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -30,8 +30,9 @@ angular.module('ngCookies', ['ng']).
3030
* @description
3131
* Provides read/write access to browser's cookies.
3232
*
33-
* Only a simple Object is exposed and by adding or removing properties to/from
34-
* this object, new cookies are created/deleted at the end of current $eval.
33+
* Only a simple Object is exposed and by adding or removing properties to/from this object, new
34+
* cookies are created/deleted at the end of current $eval.
35+
* The object's properties can only be strings.
3536
*
3637
* Requires the {@link ngCookies `ngCookies`} module to be installed.
3738
*
@@ -99,12 +100,10 @@ angular.module('ngCookies', ['ng']).
99100
for(name in cookies) {
100101
value = cookies[name];
101102
if (!angular.isString(value)) {
102-
if (angular.isDefined(lastCookies[name])) {
103-
cookies[name] = lastCookies[name];
104-
} else {
105-
delete cookies[name];
106-
}
107-
} else if (value !== lastCookies[name]) {
103+
value = '' + value;
104+
cookies[name] = value;
105+
}
106+
if (value !== lastCookies[name]) {
108107
$browser.cookies(name, value);
109108
updated = true;
110109
}

lib/angular-csp.css

-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,3 @@
1111
ng\:form {
1212
display: block;
1313
}
14-
15-
.ng-animate-block-transitions {
16-
transition:0s all!important;
17-
-webkit-transition:0s all!important;
18-
}

0 commit comments

Comments
 (0)