ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-18 07:08:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Merge] Merge in open-master, resolve conflicts in _constants.scss

Browse Source
This commit is contained in:
Charles Hacskaylo
2015-06-10 14:04:48 -07:00
parent 9f90c6b8d8 e6d830bfdc
commit d7e43026cd
36 changed files with 845 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/core/src/capabilities/MutationCapability.js
View File

@ -77,7 +77,8 @@ define(
// Get the object's model and clone it, so the
// mutator function has a temporary copy to work with.
var model = domainObject.getModel(),
clone = JSON.parse(JSON.stringify(model));
clone = JSON.parse(JSON.stringify(model)),
useTimestamp = arguments.length > 1;
// Function to handle copying values to the actual
function handleMutation(mutationResult) {
@ -94,8 +95,7 @@ define(
if (model !== result) {
copyValues(model, result);
}
model.modified = (typeof timestamp === 'number') ?
timestamp : now();
model.modified = useTimestamp ? timestamp : now();
}
// Report the result of the mutation