Skip to content

Commit 7346a4c

Browse files
RichardLittRichardLitt
committed
Merge remote-tracking branch 'upstream/master' into ngId
Removed unnecessary semicolons
2 parents fea47f7 + e16c6aa commit 7346a4c

Some content is hidden

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

53 files changed

+1167
-628
lines changed

‎CHANGELOG.md

+88
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,91 @@
1+
<a name="v1.3.0-beta.7"></a>
2+
# v1.3.0-beta.7 proper-attribution (2014-04-25)
3+
4+
5+
## Bug Fixes
6+
7+
- **$location:** don't clobber path during parsing of path
8+
([498835a1](https://github.com/angular/angular.js/commit/498835a1c4d0dc6397df4dd667796b09565fedf4),
9+
[#7199](https://github.com/angular/angular.js/issues/7199))
10+
11+
12+
## Performance Improvements
13+
14+
- **scope:** ~10x speedup from sharing the child scope class.
15+
([8377e818](https://github.com/angular/angular.js/commit/8377e81827a840b9eb64f119de4bcbaba0ceb3be))
16+
17+
18+
<a name="v1.3.0-beta.6"></a>
19+
# v1.3.0-beta.6 expedient-caffeination (2014-04-21)
20+
21+
22+
## Bug Fixes
23+
24+
- **$animate:** ensure class-based animations always perform a domOperation if skipped
25+
([708f2ba9](https://github.com/angular/angular.js/commit/708f2ba9843b665e417b93c7df907194565db991),
26+
[#6957](https://github.com/angular/angular.js/issues/6957))
27+
- **$compile:**
28+
- reference correct directive name in ctreq error
29+
([1192531e](https://github.com/angular/angular.js/commit/1192531e9b48cd90cbb601b0c0fdeb12340c1885),
30+
[#7062](https://github.com/angular/angular.js/issues/7062), [#7067](https://github.com/angular/angular.js/issues/7067))
31+
- fix regression which affected old jQuery releases
32+
([ef64169d](https://github.com/angular/angular.js/commit/ef64169db32ffdf5e0e3ae2154ac434c6a55378b))
33+
- **$location:**
34+
- fix and test html5Mode url-parsing algorithm for legacy browsers
35+
([49e7c32b](https://github.com/angular/angular.js/commit/49e7c32bb45ce3984df6768ba7b2f6a723a4ebe7))
36+
- make legacy browsers behave like modern ones in html5Mode
37+
([3f047704](https://github.com/angular/angular.js/commit/3f047704c70a957596371fec554d3e1fb066a29d),
38+
[#6162](https://github.com/angular/angular.js/issues/6162), [#6421](https://github.com/angular/angular.js/issues/6421), [#6899](https://github.com/angular/angular.js/issues/6899), [#6832](https://github.com/angular/angular.js/issues/6832), [#6834](https://github.com/angular/angular.js/issues/6834))
39+
- **input:** don't dirty model when input event triggered due to placeholder change
40+
([ff428e72](https://github.com/angular/angular.js/commit/ff428e72837c85b9540ee9e5a3daa2c9477c90bb),
41+
[#2614](https://github.com/angular/angular.js/issues/2614), [#5960](https://github.com/angular/angular.js/issues/5960))
42+
- **limitTo:** do not convert Infinity to NaN
43+
([5dee9e4a](https://github.com/angular/angular.js/commit/5dee9e4a33ab2a0be6d8a8099297be3028771e0b),
44+
[#6771](https://github.com/angular/angular.js/issues/6771), [#7118](https://github.com/angular/angular.js/issues/7118))
45+
- **ngModelController:** introduce $cancelUpdate to cancel pending updates
46+
([940fcb40](https://github.com/angular/angular.js/commit/940fcb4090e96824a4abc50252aa36aaf239e937),
47+
[#6994](https://github.com/angular/angular.js/issues/6994), [#7014](https://github.com/angular/angular.js/issues/7014))
48+
49+
50+
## Features
51+
52+
- **$resource:** Make stripping of trailing slashes configurable.
53+
([3878be52](https://github.com/angular/angular.js/commit/3878be52f6d95fca4c386d4a5523f3c8fcb04270))
54+
- **Scope:** add `$watchGroup` method for observing a set of expressions
55+
([21f93163](https://github.com/angular/angular.js/commit/21f93163384f36fc4ae0934387339380e3dc3e9c))
56+
- **injector:** "strict-DI" mode which disables "automatic" function annotation
57+
([4b1695ec](https://github.com/angular/angular.js/commit/4b1695ec61aac8de7fcac1dfe8b4b420f9842c38),
58+
[#6719](https://github.com/angular/angular.js/issues/6719), [#6717](https://github.com/angular/angular.js/issues/6717), [#4504](https://github.com/angular/angular.js/issues/4504), [#6069](https://github.com/angular/angular.js/issues/6069), [#3611](https://github.com/angular/angular.js/issues/3611))
59+
- **ngModelOptions:** custom triggers and debounce of ngModel updates
60+
([dbe381f2](https://github.com/angular/angular.js/commit/dbe381f29fc72490f8e3a5328d5c487b185fe652),
61+
[#1285](https://github.com/angular/angular.js/issues/1285))
62+
63+
64+
## Performance Improvements
65+
66+
- **$compile:** watch interpolated expressions individually
67+
([0ebfa0d1](https://github.com/angular/angular.js/commit/0ebfa0d112c8ba42242cb8353db91e93eb42b463))
68+
- **$interpolate:** speed up interpolation by recreating watchGroup approach
69+
([546cb429](https://github.com/angular/angular.js/commit/546cb429d9cea25a9bdadbb87dfd401366b0b908))
70+
71+
72+
## Breaking Changes
73+
74+
- **$interpolate:** due to [88c2193c](https://github.com/angular/angular.js/commit/88c2193c71954b9e7e7e4bdf636a2b168d36300d),
75+
the function returned by `$interpolate`
76+
no longer has a `.parts` array set on it.
77+
78+
Instead it has two arrays:
79+
* `.expressions`, an array of the expressions in the
80+
interpolated text. The expressions are parsed with
81+
`$parse`, with an extra layer converting them to strings
82+
when computed
83+
* `.separators`, an array of strings representing the
84+
separations between interpolations in the text.
85+
This array is **always** 1 item longer than the
86+
`.expressions` array for easy merging with it
87+
88+
189
<a name="1.3.0-beta.5"></a>
290
# 1.3.0-beta.5 chimeric-glitterfication (2014-04-03)
391

‎docs/app/assets/js/angular-bootstrap/bootstrap-prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
215215
}
216216
});
217217

218-
element.bind('$destroy', function() {
218+
element.on('$destroy', function() {
219219
deregisterEmbedRootScope();
220220
embedRootScope.$destroy();
221221
});

‎docs/app/assets/js/angular-bootstrap/bootstrap.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@ var popoverElement = function() {
274274
this.contentElement = angular.element(inner.childNodes[1]);
275275

276276
//stop the click on the tooltip
277-
this.element.bind('click', function(event) {
277+
this.element.on('click', function(event) {
278278
event.preventDefault();
279279
event.stopPropagation();
280280
});
281281

282282
var self = this;
283-
angular.element(document.body).bind('click',function(event) {
283+
angular.element(document.body).on('click',function(event) {
284284
if(self.visible()) self.hide();
285285
});
286286
},
@@ -359,7 +359,7 @@ directive.popover = ['popoverElement', function(popover) {
359359
restrict: 'A',
360360
priority : 500,
361361
link: function(scope, element, attrs) {
362-
element.bind('click',function(event) {
362+
element.on('click',function(event) {
363363
event.preventDefault();
364364
event.stopPropagation();
365365
if(popover.isSituatedAt(element) && popover.visible()) {
@@ -396,7 +396,7 @@ directive.foldout = ['$http', '$animate','$window', function($http, $animate, $w
396396
if(/\/build\//.test($window.location.href)) {
397397
url = '/build/docs' + url;
398398
}
399-
element.bind('click',function() {
399+
element.on('click',function() {
400400
scope.$apply(function() {
401401
if(!container) {
402402
if(loading) return;

‎docs/app/assets/js/angular-bootstrap/dropdown-toggle.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ angular.module('ui.bootstrap.dropdown', [])
3535

3636
this.open = function( dropdownScope ) {
3737
if ( !openScope ) {
38-
$document.bind('click', closeDropdown);
39-
$document.bind('keydown', escapeKeyBind);
38+
$document.on('click', closeDropdown);
39+
$document.on('keydown', escapeKeyBind);
4040
}
4141

4242
if ( openScope && openScope !== dropdownScope ) {
@@ -49,8 +49,8 @@ angular.module('ui.bootstrap.dropdown', [])
4949
this.close = function( dropdownScope ) {
5050
if ( openScope === dropdownScope ) {
5151
openScope = null;
52-
$document.unbind('click', closeDropdown);
53-
$document.unbind('keydown', escapeKeyBind);
52+
$document.off('click', closeDropdown);
53+
$document.off('keydown', escapeKeyBind);
5454
}
5555
};
5656

@@ -124,7 +124,7 @@ angular.module('ui.bootstrap.dropdown', [])
124124
return;
125125
}
126126

127-
element.bind('click', function(event) {
127+
element.on('click', function(event) {
128128
event.preventDefault();
129129
event.stopPropagation();
130130

‎docs/app/src/docs.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
angular.module('DocsController', [])
22

3-
.controller('DocsController', function($scope, $rootScope, $location, $window, $cookies, NG_PAGES, NG_NAVIGATION, NG_VERSION) {
3+
.controller('DocsController', [
4+
'$scope', '$rootScope', '$location', '$window', '$cookies', 'openPlunkr',
5+
'NG_PAGES', 'NG_NAVIGATION', 'NG_VERSION',
6+
function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
7+
NG_PAGES, NG_NAVIGATION, NG_VERSION) {
8+
9+
10+
$scope.openPlunkr = openPlunkr;
411

512
$scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;
6-
13+
714
$scope.fold = function(url) {
815
if(url) {
916
$scope.docs_fold = '/notes/' + url;
@@ -120,4 +127,4 @@ angular.module('DocsController', [])
120127
});
121128
}
122129
});
123-
});
130+
}]);

0 commit comments

Comments
 (0)