Skip to content

Commit f865c95

Browse files
Merge pull request #6 from angular/master
Update upstream
2 parents 68082dd + f403925 commit f865c95

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

docs/content/guide/migration.ngdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,7 @@ Due to [b71d7c3f](https://github.com/angular/angular.js/commit/b71d7c3f3c04e65b0
12961296
falsy values (`''`, `0`, `false` and `null`) are properly recognized as option group identifiers for
12971297
options passed to `ngOptions`. Previously, all of these values were ignored and the option was not
12981298
assigned to any group. `undefined` is still interpreted as "no group".
1299-
If you have options with falsy group indentifiers that should still not be assigned to any group,
1299+
If you have options with falsy group identifiers that should still not be assigned to any group,
13001300
then you must filter the values before passing them to `ngOptions`, converting falsy values to
13011301
`undefined`.
13021302

src/ng/compile.js

-6
Original file line numberDiff line numberDiff line change
@@ -374,12 +374,6 @@
374374
* `$onInit`, which is called after all the controllers on an element have been constructed and had their bindings
375375
* initialized.
376376
*
377-
* <div class="alert alert-warning">
378-
* **Deprecation warning:** although bindings for non-ES6 class controllers are currently
379-
* bound to `this` before the controller constructor is called, this use is now deprecated. Please place initialization
380-
* code that relies upon bindings inside a `$onInit` method on the controller, instead.
381-
* </div>
382-
*
383377
* It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
384378
* This will set up the scope bindings to the controller directly. Note that `scope` can still be used
385379
* to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate

0 commit comments

Comments
 (0)