Skip to content

Commit 4bd7a8d

Browse files
Merge pull request #67 from angular/master
Update upstream
2 parents bae67da + 73c6467 commit 4bd7a8d

File tree

5 files changed

+28
-112
lines changed

5 files changed

+28
-112
lines changed

angularFiles.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ var angularFiles = {
109109
],
110110
'ngCookies': [
111111
'src/ngCookies/cookies.js',
112-
'src/ngCookies/cookieStore.js',
113112
'src/ngCookies/cookieWriter.js'
114113
],
115114
'ngMessageFormat': [

docs/content/api/index.ngdoc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,7 @@ Use the ngCookies module to handle cookie management within your application.
222222
{@link ngCookies#service Services / Factories}
223223
</td>
224224
<td>
225-
The following services are used for cookie management:
226-
<ul>
227-
<li>The {@link ngCookies.$cookies $cookie} service is a convenient wrapper to store simple data within browser cookies.</li>
228-
<li>{@link ngCookies.$cookieStore $cookieStore} is used to store more complex data using serialization.</li>
229-
</ul>
225+
The {@link ngCookies.$cookies $cookies} service is a convenient wrapper to store simple data within browser cookies.
230226
</td>
231227
</tr>
232228
</table>

src/ng/directive/input.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,33 @@ var inputType = {
980980
* @description
981981
* HTML radio button.
982982
*
983+
* **Note:**<br>
984+
* All inputs controlled by {@link ngModel ngModel} (including those of type `radio`) will use the
985+
* value of their `name` attribute to determine the property under which their
986+
* {@link ngModel.NgModelController NgModelController} will be published on the parent
987+
* {@link form.FormController FormController}. Thus, if you use the same `name` for multiple
988+
* inputs of a form (e.g. a group of radio inputs), only _one_ `NgModelController` will be
989+
* published on the parent `FormController` under that name. The rest of the controllers will
990+
* continue to work as expected, but you won't be able to access them as properties on the parent
991+
* `FormController`.
992+
*
993+
* <div class="alert alert-info">
994+
* <p>
995+
* In plain HTML forms, the `name` attribute is used to identify groups of radio inputs, so
996+
* that the browser can manage their state (checked/unchecked) based on the state of other
997+
* inputs in the same group.
998+
* </p>
999+
* <p>
1000+
* In AngularJS forms, this is not necessary. The input's state will be updated based on the
1001+
* value of the underlying model data.
1002+
* </p>
1003+
* </div>
1004+
*
1005+
* <div class="alert alert-success">
1006+
* If you omit the `name` attribute on a radio input, `ngModel` will automatically assign it a
1007+
* unique name.
1008+
* </div>
1009+
*
9831010
* @param {string} ngModel Assignable AngularJS expression to data-bind to.
9841011
* @param {string} value The value to which the `ngModel` expression should be set when selected.
9851012
* Note that `value` only supports `string` values, i.e. the scope model needs to be a string,

src/ngCookies/cookieStore.js

Lines changed: 0 additions & 79 deletions
This file was deleted.

test/ngCookies/cookieStoreSpec.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)