aboutsummaryrefslogtreecommitdiffstats
path: root/src/widget/select.js
diff options
context:
space:
mode:
authorMisko Hevery2011-11-03 21:14:04 -0700
committerMisko Hevery2011-11-14 20:31:14 -0800
commitc27aba4354c69c4a67fab587a59a8079cc9edc91 (patch)
tree7ea9f170c197dddcfb8014fc85437523090d18a4 /src/widget/select.js
parentdd9151e522220b438074e55c72f47ed2a8da9933 (diff)
downloadangular.js-c27aba4354c69c4a67fab587a59a8079cc9edc91.tar.bz2
refactor(api): remove type augmentation
BREAK: - remove angular.[Object/Array/String/Function] - in templates [].$filter(predicate) and friends need to change to [] | filter:predicate
Diffstat (limited to 'src/widget/select.js')
-rw-r--r--src/widget/select.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/widget/select.js b/src/widget/select.js
index c70b5ded..e66d4cba 100644
--- a/src/widget/select.js
+++ b/src/widget/select.js
@@ -131,7 +131,8 @@ angularWidget('select', function(element){
this.directives(true);
this.descend(true);
return element.attr('ng:model') &&
- ['$formFactory', '$compile', '$element', function($formFactory, $compile, selectElement){
+ ['$formFactory', '$compile', '$parse', '$element',
+ function($formFactory, $compile, $parse, selectElement){
var modelScope = this,
match,
form = $formFactory.forElement(selectElement),
@@ -224,12 +225,12 @@ angularWidget('select', function(element){
}
var widgetScope = this,
- displayFn = expressionCompile(match[2] || match[1]),
+ displayFn = $parse(match[2] || match[1]),
valueName = match[4] || match[6],
keyName = match[5],
- groupByFn = expressionCompile(match[3] || ''),
- valueFn = expressionCompile(match[2] ? match[1] : valueName),
- valuesFn = expressionCompile(match[7]),
+ groupByFn = $parse(match[3] || ''),
+ valueFn = $parse(match[2] ? match[1] : valueName),
+ valuesFn = $parse(match[7]),
// we can't just jqLite('<option>') since jqLite is not smart enough
// to create it in <select> and IE barfs otherwise.
optionTemplate = jqLite(document.createElement('option')),