aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-05-10 20:41:12 -0700
committerMisko Hevery2010-05-10 20:41:12 -0700
commit271b535c8285cb90781bf1e8ee56d6e68210a6a9 (patch)
tree967b6f4673a49accb4e7fe2387b25d13e4115607
parent81e99799a8c999d8038dd27bf86bb8ca6a3add11 (diff)
downloadangular.js-271b535c8285cb90781bf1e8ee56d6e68210a6a9.tar.bz2
fix handling of null on ie
-rw-r--r--src/widgets.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets.js b/src/widgets.js
index d63616ac..24c85464 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -44,17 +44,17 @@ function valueAccessor(scope, element) {
}
},
set: function(value) {
- var oldValue = element[0].value,
+ var oldValue = element.val(),
newValue = format(value);
if (oldValue != newValue) {
- element[0].value = newValue;
+ element.val(newValue || ''); // needed for ie
}
validate();
}
};
function validate() {
- var value = trim(element[0].value);
+ var value = trim(element.val());
if (element[0].disabled || element[0].readOnly) {
elementError(element, NG_VALIDATION_ERROR, null);
invalidWidgets.markValid(element);
@@ -142,8 +142,9 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initW
function initWidgetValue(initValue) {
return function (model, view) {
var value = view.get();
- if (!value && isDefined(initValue))
+ if (!value && isDefined(initValue)) {
value = copy(initValue);
+ }
if (isUndefined(model.get()) && isDefined(value)) {
model.set(value);
}