mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-20 12:21:52 +00:00
fix handling of null on ie
This commit is contained in:
parent
81e99799a8
commit
271b535c82
1 changed files with 5 additions and 4 deletions
|
|
@ -44,17 +44,17 @@ function valueAccessor(scope, element) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
set: function(value) {
|
set: function(value) {
|
||||||
var oldValue = element[0].value,
|
var oldValue = element.val(),
|
||||||
newValue = format(value);
|
newValue = format(value);
|
||||||
if (oldValue != newValue) {
|
if (oldValue != newValue) {
|
||||||
element[0].value = newValue;
|
element.val(newValue || ''); // needed for ie
|
||||||
}
|
}
|
||||||
validate();
|
validate();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
function validate() {
|
function validate() {
|
||||||
var value = trim(element[0].value);
|
var value = trim(element.val());
|
||||||
if (element[0].disabled || element[0].readOnly) {
|
if (element[0].disabled || element[0].readOnly) {
|
||||||
elementError(element, NG_VALIDATION_ERROR, null);
|
elementError(element, NG_VALIDATION_ERROR, null);
|
||||||
invalidWidgets.markValid(element);
|
invalidWidgets.markValid(element);
|
||||||
|
|
@ -142,8 +142,9 @@ var textWidget = inputWidget('keyup change', modelAccessor, valueAccessor, initW
|
||||||
function initWidgetValue(initValue) {
|
function initWidgetValue(initValue) {
|
||||||
return function (model, view) {
|
return function (model, view) {
|
||||||
var value = view.get();
|
var value = view.get();
|
||||||
if (!value && isDefined(initValue))
|
if (!value && isDefined(initValue)) {
|
||||||
value = copy(initValue);
|
value = copy(initValue);
|
||||||
|
}
|
||||||
if (isUndefined(model.get()) && isDefined(value)) {
|
if (isUndefined(model.get()) && isDefined(value)) {
|
||||||
model.set(value);
|
model.set(value);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue