Skip to content

Fix objects observability #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix objects observability #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions knockout.mapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
options = fillOptions(options);

var result = updateViewModel(target, jsObject, options);
result = ko.utils.unwrapObservable(result);
if (target) {
result = target;
}
Expand Down Expand Up @@ -365,9 +366,13 @@
return options[parentName].update(params);
}

var ensureObservable = function(value) {
return ko.isObservable(value) ? value : ko.observable(value);
}

var alreadyMapped = visitedObjects.get(rootObject);
if (alreadyMapped) {
return alreadyMapped;
return ensureObservable(alreadyMapped);
}

parentName = parentName || "";
Expand All @@ -393,11 +398,11 @@
if (hasUpdateCallback()) {
var valueToWrite = updateCallback(mappedRootObject);
mappedRootObject(valueToWrite);
return valueToWrite;
return mappedRootObject;
} else {
var valueToWrite = ko.utils.unwrapObservable(rootObject);
mappedRootObject(valueToWrite);
return valueToWrite;
return mappedRootObject;
}
} else {
var hasCreateOrUpdateCallback = hasCreateCallback() || hasUpdateCallback();
Expand Down Expand Up @@ -488,6 +493,8 @@

options.mappedProperties[fullPropertyName] = true;
});

mappedRootObject = ensureObservable(mappedRootObject);
}
} else { //mappedRootObject is an array
var changes = [];
Expand Down