Skip to content

Commit acaafa0

Browse files
committed
Release 1.12.0-beta.2
1 parent 76cbce0 commit acaafa0

File tree

11 files changed

+239
-133
lines changed

11 files changed

+239
-133
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "ember",
3-
"version": "1.12.0-beta.1",
3+
"version": "1.12.0-beta.2",
44
"main": [
55
"./ember.debug.js",
66
"./ember-template-compiler.js"
77
],
88
"dependencies": {
99
"jquery": ">= 1.7.0 < 2.2.0"
1010
}
11-
}
11+
}

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ember",
33
"repo": "components/ember",
4-
"version": "1.12.0-beta.1",
4+
"version": "1.12.0-beta.2",
55
"main": "ember.debug.js",
66
"scripts": [
77
"ember.debug.js"

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
}
2525
}
2626
},
27-
"version": "1.12.0-beta.1"
27+
"version": "1.12.0-beta.2"
2828
}

ember-docs.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "The Ember API",
44
"description": "The Ember API: a framework for building ambitious web applications",
55
"url": "http://emberjs.com/",
6-
"version": "1.12.0-beta.1"
6+
"version": "1.12.0-beta.2"
77
},
88
"files": {
99
"bower_components/rsvp/lib/rsvp/promise/all.js": {
@@ -4053,7 +4053,7 @@
40534053
"submodule": "ember-views",
40544054
"namespace": "Ember",
40554055
"file": "packages/ember-views/lib/views/select.js",
4056-
"line": 96,
4056+
"line": 82,
40574057
"description": "The `Ember.Select` view class renders a\n[select](https://developer.mozilla.org/en/HTML/Element/select) HTML element,\nallowing the user to choose from a list of options.\n\nThe text and `value` property of each `<option>` element within the\n`<select>` element are populated from the objects in the `Element.Select`'s\n`content` property. The underlying data object of the selected `<option>` is\nstored in the `Element.Select`'s `value` property.\n\n## The Content Property (array of strings)\n\nThe simplest version of an `Ember.Select` takes an array of strings as its\n`content` property. The string will be used as both the `value` property and\nthe inner text of each `<option>` element inside the rendered `<select>`.\n\nExample:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n names: [\"Yehuda\", \"Tom\"]\n});\n```\n\n```handlebars\n{{view \"select\" content=names}}\n```\n\nWould result in the following HTML:\n\n```html\n<select class=\"ember-select\">\n <option value=\"Yehuda\">Yehuda</option>\n <option value=\"Tom\">Tom</option>\n</select>\n```\n\nYou can control which `<option>` is selected through the `Ember.Select`'s\n`value` property:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n selectedName: 'Tom',\n names: [\"Yehuda\", \"Tom\"]\n});\n```\n\n```handlebars\n{{view \"select\" content=names value=selectedName}}\n```\n\nWould result in the following HTML with the `<option>` for 'Tom' selected:\n\n```html\n<select class=\"ember-select\">\n <option value=\"Yehuda\">Yehuda</option>\n <option value=\"Tom\" selected=\"selected\">Tom</option>\n</select>\n```\n\nA user interacting with the rendered `<select>` to choose \"Yehuda\" would\nupdate the value of `selectedName` to \"Yehuda\".\n\n## The Content Property (array of Objects)\n\nAn `Ember.Select` can also take an array of JavaScript or Ember objects as\nits `content` property.\n\nWhen using objects you need to tell the `Ember.Select` which property should\nbe accessed on each object to supply the `value` attribute of the `<option>`\nand which property should be used to supply the element text.\n\nThe `optionValuePath` option is used to specify the path on each object to\nthe desired property for the `value` attribute. The `optionLabelPath`\nspecifies the path on each object to the desired property for the\nelement's text. Both paths must reference each object itself as `content`:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n programmers: [\n {firstName: \"Yehuda\", id: 1},\n {firstName: \"Tom\", id: 2}\n ]\n});\n```\n\n```handlebars\n{{view \"select\"\n content=programmers\n optionValuePath=\"content.id\"\n optionLabelPath=\"content.firstName\"}}\n```\n\nWould result in the following HTML:\n\n```html\n<select class=\"ember-select\">\n <option value=\"1\">Yehuda</option>\n <option value=\"2\">Tom</option>\n</select>\n```\n\nThe `value` attribute of the selected `<option>` within an `Ember.Select`\ncan be bound to a property on another object:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n programmers: [\n {firstName: \"Yehuda\", id: 1},\n {firstName: \"Tom\", id: 2}\n ],\n currentProgrammer: {\n id: 2\n }\n});\n```\n\n```handlebars\n{{view \"select\"\n content=programmers\n optionValuePath=\"content.id\"\n optionLabelPath=\"content.firstName\"\n value=currentProgrammer.id}}\n```\n\nWould result in the following HTML with a selected option:\n\n```html\n<select class=\"ember-select\">\n <option value=\"1\">Yehuda</option>\n <option value=\"2\" selected=\"selected\">Tom</option>\n</select>\n```\n\nInteracting with the rendered element by selecting the first option\n('Yehuda') will update the `id` of `currentProgrammer`\nto match the `value` property of the newly selected `<option>`.\n\nAlternatively, you can control selection through the underlying objects\nused to render each object by binding the `selection` option. When the selected\n`<option>` is changed, the property path provided to `selection`\nwill be updated to match the content object of the rendered `<option>`\nelement:\n\n```javascript\n\nvar yehuda = {firstName: \"Yehuda\", id: 1, bff4eva: 'tom'}\nvar tom = {firstName: \"Tom\", id: 2, bff4eva: 'yehuda'};\n\nApp.ApplicationController = Ember.ObjectController.extend({\n selectedPerson: tom,\n programmers: [ yehuda, tom ]\n});\n```\n\n```handlebars\n{{view \"select\"\n content=programmers\n optionValuePath=\"content.id\"\n optionLabelPath=\"content.firstName\"\n selection=selectedPerson}}\n```\n\nWould result in the following HTML with a selected option:\n\n```html\n<select class=\"ember-select\">\n <option value=\"1\">Yehuda</option>\n <option value=\"2\" selected=\"selected\">Tom</option>\n</select>\n```\n\nInteracting with the rendered element by selecting the first option\n('Yehuda') will update the `selectedPerson` to match the object of\nthe newly selected `<option>`. In this case it is the first object\nin the `programmers`\n\n## Supplying a Prompt\n\nA `null` value for the `Ember.Select`'s `value` or `selection` property\nresults in there being no `<option>` with a `selected` attribute:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n selectedProgrammer: null,\n programmers: [\"Yehuda\", \"Tom\"]\n});\n```\n\n``` handlebars\n{{view \"select\"\n content=programmers\n value=selectedProgrammer\n}}\n```\n\nWould result in the following HTML:\n\n```html\n<select class=\"ember-select\">\n <option value=\"Yehuda\">Yehuda</option>\n <option value=\"Tom\">Tom</option>\n</select>\n```\n\nAlthough `selectedProgrammer` is `null` and no `<option>`\nhas a `selected` attribute the rendered HTML will display the\nfirst item as though it were selected. You can supply a string\nvalue for the `Ember.Select` to display when there is no selection\nwith the `prompt` option:\n\n```javascript\nApp.ApplicationController = Ember.ObjectController.extend({\n selectedProgrammer: null,\n programmers: [ \"Yehuda\", \"Tom\" ]\n});\n```\n\n```handlebars\n{{view \"select\"\n content=programmers\n value=selectedProgrammer\n prompt=\"Please select a name\"\n}}\n```\n\nWould result in the following HTML:\n\n```html\n<select class=\"ember-select\">\n <option>Please select a name</option>\n <option value=\"Yehuda\">Yehuda</option>\n <option value=\"Tom\">Tom</option>\n</select>\n```",
40584058
"extends": "Ember.View"
40594059
},
@@ -20111,7 +20111,7 @@
2011120111
},
2011220112
{
2011320113
"file": "packages/ember-views/lib/views/select.js",
20114-
"line": 354,
20114+
"line": 340,
2011520115
"description": "The `multiple` attribute of the select element. Indicates whether multiple\noptions can be selected.",
2011620116
"itemtype": "property",
2011720117
"name": "multiple",
@@ -20124,7 +20124,7 @@
2012420124
},
2012520125
{
2012620126
"file": "packages/ember-views/lib/views/select.js",
20127-
"line": 364,
20127+
"line": 350,
2012820128
"description": "The `disabled` attribute of the select element. Indicates whether\nthe element is disabled from interactions.",
2012920129
"itemtype": "property",
2013020130
"name": "disabled",
@@ -20137,7 +20137,7 @@
2013720137
},
2013820138
{
2013920139
"file": "packages/ember-views/lib/views/select.js",
20140-
"line": 374,
20140+
"line": 360,
2014120141
"description": "The `required` attribute of the select element. Indicates whether\na selected option is required for form validation.",
2014220142
"itemtype": "property",
2014320143
"name": "required",
@@ -20151,7 +20151,7 @@
2015120151
},
2015220152
{
2015320153
"file": "packages/ember-views/lib/views/select.js",
20154-
"line": 385,
20154+
"line": 371,
2015520155
"description": "The list of options.\n\nIf `optionLabelPath` and `optionValuePath` are not overridden, this should\nbe a list of strings, which will serve simultaneously as labels and values.\n\nOtherwise, this should be a list of objects. For instance:\n\n```javascript\nvar App = Ember.Application.create();\nvar App.MySelect = Ember.Select.extend({\n content: Ember.A([\n { id: 1, firstName: 'Yehuda' },\n { id: 2, firstName: 'Tom' }\n ]),\n optionLabelPath: 'content.firstName',\n optionValuePath: 'content.id'\n});\n```",
2015620156
"itemtype": "property",
2015720157
"name": "content",
@@ -20164,7 +20164,7 @@
2016420164
},
2016520165
{
2016620166
"file": "packages/ember-views/lib/views/select.js",
20167-
"line": 411,
20167+
"line": 397,
2016820168
"description": "When `multiple` is `false`, the element of `content` that is currently\nselected, if any.\n\nWhen `multiple` is `true`, an array of such elements.",
2016920169
"itemtype": "property",
2017020170
"name": "selection",
@@ -20177,7 +20177,7 @@
2017720177
},
2017820178
{
2017920179
"file": "packages/ember-views/lib/views/select.js",
20180-
"line": 423,
20180+
"line": 409,
2018120181
"description": "In single selection mode (when `multiple` is `false`), value can be used to\nget the current selection's value or set the selection by its value.\n\nIt is not currently supported in multiple selection mode.",
2018220182
"itemtype": "property",
2018320183
"name": "value",
@@ -20190,7 +20190,7 @@
2019020190
},
2019120191
{
2019220192
"file": "packages/ember-views/lib/views/select.js",
20193-
"line": 443,
20193+
"line": 429,
2019420194
"description": "If given, a top-most dummy option will be rendered to serve as a user\nprompt.",
2019520195
"itemtype": "property",
2019620196
"name": "prompt",
@@ -20203,7 +20203,7 @@
2020320203
},
2020420204
{
2020520205
"file": "packages/ember-views/lib/views/select.js",
20206-
"line": 453,
20206+
"line": 439,
2020720207
"description": "The path of the option labels. See [content](/api/classes/Ember.Select.html#property_content).",
2020820208
"itemtype": "property",
2020920209
"name": "optionLabelPath",
@@ -20216,7 +20216,7 @@
2021620216
},
2021720217
{
2021820218
"file": "packages/ember-views/lib/views/select.js",
20219-
"line": 462,
20219+
"line": 448,
2022020220
"description": "The path of the option values. See [content](/api/classes/Ember.Select.html#property_content).",
2022120221
"itemtype": "property",
2022220222
"name": "optionValuePath",
@@ -20229,7 +20229,7 @@
2022920229
},
2023020230
{
2023120231
"file": "packages/ember-views/lib/views/select.js",
20232-
"line": 471,
20232+
"line": 457,
2023320233
"description": "The path of the option group.\nWhen this property is used, `content` should be sorted by `optionGroupPath`.",
2023420234
"itemtype": "property",
2023520235
"name": "optionGroupPath",
@@ -20242,7 +20242,7 @@
2024220242
},
2024320243
{
2024420244
"file": "packages/ember-views/lib/views/select.js",
20245-
"line": 481,
20245+
"line": 467,
2024620246
"description": "The view class for optgroup.",
2024720247
"itemtype": "property",
2024820248
"name": "groupView",
@@ -20255,7 +20255,7 @@
2025520255
},
2025620256
{
2025720257
"file": "packages/ember-views/lib/views/select.js",
20258-
"line": 511,
20258+
"line": 497,
2025920259
"description": "The view class for option.",
2026020260
"itemtype": "property",
2026120261
"name": "optionView",

ember-template-compiler.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
66
* @license Licensed under MIT license
77
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
8-
* @version 1.12.0-beta.1
8+
* @version 1.12.0-beta.2
99
*/
1010

1111
(function() {
@@ -2588,7 +2588,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
25882588
25892589
@class Ember
25902590
@static
2591-
@version 1.12.0-beta.1
2591+
@version 1.12.0-beta.2
25922592
*/
25932593

25942594
if ("undefined" === typeof Ember) {
@@ -2617,10 +2617,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
26172617
/**
26182618
@property VERSION
26192619
@type String
2620-
@default '1.12.0-beta.1'
2620+
@default '1.12.0-beta.2'
26212621
@static
26222622
*/
2623-
Ember.VERSION = "1.12.0-beta.1";
2623+
Ember.VERSION = "1.12.0-beta.2";
26242624

26252625
/**
26262626
Standard environmental variables. You can define these in a global `EmberENV`
@@ -9334,7 +9334,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
93349334
var disableComponentGeneration = true;
93359335

93369336
return {
9337-
revision: "Ember@1.12.0-beta.1",
9337+
revision: "Ember@1.12.0-beta.2",
93389338

93399339
disableComponentGeneration: disableComponentGeneration,
93409340

ember-testing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
66
* @license Licensed under MIT license
77
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
8-
* @version 1.12.0-beta.1
8+
* @version 1.12.0-beta.2
99
*/
1010

1111
(function() {

0 commit comments

Comments
 (0)