Skip to content
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

fix typos #68

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix typos #68

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d33ef4b
fixed typo recrusive; actually use global options
istr Jun 18, 2014
1474fd2
Merge pull request #1 from istr/master
jasonm23 Jun 15, 2015
c951f71
fix typos, set global options
jasonm23 Jun 15, 2015
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
82 changes: 42 additions & 40 deletions knockout.viewmodel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*ko.viewmodel.js - version 2.0.3
/*ko.viewmodel.js - version 2.0.3
* Copyright 2013, Dave Herren http://coderenaissance.github.com/knockout.viewmodel/
* License: MIT (http://www.opensource.org/licenses/mit-license.php)*/
/*jshint eqnull:true, boss:true, loopfunc:true, evil:true, laxbreak:true, undef:true, unused:true, browser:true, immed:true, devel:true, sub: true, maxerr:50 */
/*global ko:false */

(function () {
//Module declarations. For increased compression with simple settings on the closure compiler,
//the ko functions are stored in variables. These variable names will be shortened by the compiler,
//the ko functions are stored in variables. These variable names will be shortened by the compiler,
//whereas references to ko would not be. There is also a performance savings from this.
var unwrap = ko.utils.unwrapObservable,
isObservable = ko.isObservable,
Expand Down Expand Up @@ -70,18 +70,18 @@

//while dates aren't part of the JSON spec it doesn't hurt to support them as it's not unreasonable to think they might be added to the model manually.
//undefined is also not part of the spec, but it's currently be supported to be more in line with ko.mapping and probably doesn't hurt.
function isPrimativeOrDate(obj) {
function isPrimitiveOrDate(obj) {
return obj === null || obj === undefined || obj.constructor === String || obj.constructor === Number || obj.constructor === Boolean || obj instanceof Date;
}

function recrusiveFrom(modelObj, settings, context, pathSettings) {
function recursiveFrom(modelObj, settings, context, pathSettings) {
var temp, result, p, length, idName, newContext, customPathSettings, extend, optionProcessed,
childPathSettings, childObj;
pathSettings = pathSettings || getPathSettings(settings, context);

if (customPathSettings = pathSettings.custom) {
optionProcessed = true;
//custom can either be specified as a single map function or as an
//custom can either be specified as a single map function or as an
//object with map and unmap properties
if (typeof customPathSettings === "function") {
result = customPathSettings(modelObj);
Expand All @@ -107,15 +107,15 @@
optionProcessed = true;
return badResult;
}
else if (isPrimativeOrDate(modelObj)) {
//primative and date children of arrays aren't mapped... all others are
else if (isPrimitiveOrDate(modelObj)) {
//primitive and date children of arrays aren't mapped... all others are
result = context.parentIsArray ? modelObj : makeObservable(modelObj);
}
else if (modelObj instanceof Array) {
result = [];

for (p = 0, length = modelObj.length; p < length; p++) {
result[p] = recrusiveFrom(modelObj[p], settings, {
result[p] = recursiveFrom(modelObj[p], settings, {
name: "[i]", parent: context.name + "[i]", full: context.full + "[i]", parentIsArray: true
});
}
Expand All @@ -134,20 +134,20 @@
//wrap array methods for adding and removing items in functions that
//close over settings and context allowing the objects and their children to be correctly mapped.
result.pushFromModel = function (item) {
item = recrusiveFrom(item, settings, newContext);
item = recursiveFrom(item, settings, newContext);
result.push(item);
};
result.unshiftFromModel = function (item) {
item = recrusiveFrom(item, settings, newContext);
item = recursiveFrom(item, settings, newContext);
result.unshift(item);
};
result.popToModel = function (item) {
item = result.pop();
return recrusiveTo(item, newContext);
return recursiveTo(item, newContext);
};
result.shiftToModel = function (item) {
item = result.shift();
return recrusiveTo(item, newContext);
return recursiveTo(item, newContext);
};
}

Expand All @@ -161,10 +161,10 @@
full: context.full + "." + p
};
childObj = modelObj[p];
childPathSettings = isPrimativeOrDate(childObj) ? getPathSettings(settings, newContext) : undefined;
childPathSettings = isPrimitiveOrDate(childObj) ? getPathSettings(settings, newContext) : undefined;

if (childPathSettings && childPathSettings.custom) {//primativish value w/ custom maping
//since primative children cannot store their own custom functions, handle processing here and store them in the parent
//since primitive children cannot store their own custom functions, handle processing here and store them in the parent
result.___$customChildren = result.___$customChildren || {};
result.___$customChildren[p] = childPathSettings.custom;

Expand All @@ -176,7 +176,7 @@
}
}
else {
temp = recrusiveFrom(childObj, settings, newContext, childPathSettings);//call recursive from on each child property
temp = recursiveFrom(childObj, settings, newContext, childPathSettings);//call recursive from on each child property

if (temp !== badResult) {//properties that couldn't be mapped return badResult
result[p] = temp;
Expand Down Expand Up @@ -205,7 +205,7 @@
return result;
}

function recrusiveTo(viewModelObj, context) {
function recursiveTo(viewModelObj, context) {
var result, p, length, temp, unwrapped = unwrap(viewModelObj), child, recursiveResult,
wasWrapped = (viewModelObj !== unwrapped);//this works because unwrap observable calls isObservable and returns the object unchanged if not observable

Expand All @@ -219,14 +219,14 @@
else if (viewModelObj && viewModelObj.___$unmapCustom) {//Defer to customUnmapping where specified
result = viewModelObj.___$unmapCustom(viewModelObj);
}
else if ((wasWrapped && isPrimativeOrDate(unwrapped)) || isNullOrUndefined(unwrapped)) {
else if ((wasWrapped && isPrimitiveOrDate(unwrapped)) || isNullOrUndefined(unwrapped)) {
//return null, undefined, values, and wrapped primativish values as is
result = unwrapped;
}
else if (unwrapped instanceof Array) {//create new array to return and add unwrapped values to it
result = [];
for (p = 0, length = unwrapped.length; p < length; p++) {
result[p] = recrusiveTo(unwrapped[p], {
result[p] = recursiveTo(unwrapped[p], {
name: "[i]", parent: context.name + "[i]", full: context.full + "[i]"
});
}
Expand All @@ -242,7 +242,7 @@
child = unwrapped[p];
if (!ko.isComputed(child) && !((temp = unwrap(child)) && temp.constructor === Function)) {

recursiveResult = recrusiveTo(child, {
recursiveResult = recursiveTo(child, {
name: p,
parent: (context.name === "[i]" ? context.parent : context.name) + "." + p,
full: context.full + "." + p
Expand Down Expand Up @@ -271,7 +271,7 @@
return result;
}

function recursiveUpdate(modelObj, viewModelObj, context, parentObj, noncontiguousObjectUpdateCount) {
function recursiveUpdate(modelObj, viewModelObj, context, parentObj, nonContiguousObjectUpdateCount) {
var p, q, foundModels, foundViewmodels, modelId, viewmodelId, idName, length, unwrapped = unwrap(viewModelObj),
wasWrapped = (viewModelObj !== unwrapped), child, map, tempArray, childTemp, childMap, unwrappedChild, tempChild;

Expand All @@ -280,7 +280,7 @@
}

if (wasWrapped && (isNullOrUndefined(unwrapped) ^ isNullOrUndefined(modelObj))) {
//if you have an observable to update and either the new or old value is
//if you have an observable to update and either the new or old value is
//null or undefined then update the observable
viewModelObj(modelObj);
}
Expand All @@ -294,7 +294,7 @@
else {
child = unwrapped[p];

if (!wasWrapped && unwrapped.hasOwnProperty(p) && (isPrimativeOrDate(child) || (child && child.constructor === Array))) {
if (!wasWrapped && unwrapped.hasOwnProperty(p) && (isPrimitiveOrDate(child) || (child && child.constructor === Array))) {
unwrapped[p] = modelObj[p];
}
else if (child && typeof child.___$mapCustom === "function") {
Expand All @@ -314,18 +314,18 @@
unwrapped[p] = modelObj[p];
}
else {//Recursive update everything else
if (!!noncontiguousObjectUpdateCount) {
if (!!nonContiguousObjectUpdateCount) {
var fnRecursivePropertyObjectUpdate = (function (modelObj, viewModelObj, p) {
return function () {//keep in sync with else below
recursiveUpdate(modelObj[p], unwrapped[p], {
name: p,
parent: (context.name === "[i]" ? context.parent : context.name) + "." + p,
full: context.full + "." + p
}, unwrapped, noncontiguousObjectUpdateCount);
noncontiguousObjectUpdateCount(noncontiguousObjectUpdateCount() - 1);
}, unwrapped, nonContiguousObjectUpdateCount);
nonContiguousObjectUpdateCount(nonContiguousObjectUpdateCount() - 1);
};
}(modelObj, viewModelObj, p));
noncontiguousObjectUpdateCount(noncontiguousObjectUpdateCount() + 1);
nonContiguousObjectUpdateCount(nonContiguousObjectUpdateCount() + 1);
setTimeout(fnRecursivePropertyObjectUpdate, 0);
}
else {//keep in sync with if above
Expand Down Expand Up @@ -358,25 +358,25 @@
child(unwrap(tempChild));
}
//else custom mapping returned previous observable;
//if it's smart enough to do that, assume it updated it correctly
//if it's smart enough to do that, assume it updated it correctly
}
else {
unwrapped[q] = child.___$mapCustom(modelObj[p], child);
}
}
else {
if (!!noncontiguousObjectUpdateCount) {//keep in sync with else block below

if (!!nonContiguousObjectUpdateCount) {//keep in sync with else block below
var fnRecursiveArrayChildObjectUpdate = (function (modelObj, viewModelObj, p, q) {
return function () {
recursiveUpdate(modelObj[p], unwrapped[q], {
name: "[i]", parent: context.name + "[i]", full: context.full + "[i]"
}, undefined, noncontiguousObjectUpdateCount);
}, undefined, nonContiguousObjectUpdateCount);

noncontiguousObjectUpdateCount(noncontiguousObjectUpdateCount() - 1);
nonContiguousObjectUpdateCount(nonContiguousObjectUpdateCount() - 1);
};
}(modelObj, viewModelObj, p, q));
noncontiguousObjectUpdateCount(noncontiguousObjectUpdateCount() + 1);
nonContiguousObjectUpdateCount(nonContiguousObjectUpdateCount() + 1);
setTimeout(fnRecursiveArrayChildObjectUpdate, 0);
}
else {//keep in sync with if block above
Expand Down Expand Up @@ -423,13 +423,13 @@
viewModelObj(modelObj);
}

if (context.name === "{root}" && !!noncontiguousObjectUpdateCount) {
if (context.name === "{root}" && !!nonContiguousObjectUpdateCount) {
return {
onComplete:function (fnOnComplete) {
if(fnOnComplete && typeof fnOnComplete == "function"){
if (!!noncontiguousObjectUpdateCount) {
if (!!nonContiguousObjectUpdateCount) {
ko.computed(function () {
if (fnOnComplete && noncontiguousObjectUpdateCount() === 0) {
if (fnOnComplete && nonContiguousObjectUpdateCount() === 0) {
fnOnComplete();
fnOnComplete = undefined;
}
Expand Down Expand Up @@ -477,18 +477,20 @@
logging: false
},
fromModel: function fnFromModel(model, options) {
// merge in global options
if (options) for (opt in this.options) if (options[opt]) this.options[opt] = options[opt];
var settings = getPathSettingsDictionary(options);
initInternals(this.options, "Mapping From Model");
return recrusiveFrom(model, settings, rootContext);
return recursiveFrom(model, settings, rootContext);
},
toModel: function fnToModel(viewmodel) {
initInternals(this.options, "Mapping To Model");
return recrusiveTo(viewmodel, rootContext);
return recursiveTo(viewmodel, rootContext);
},
updateFromModel: function fnUpdateFromModel(viewmodel, model, makeNoncontiguousObjectUpdates) {
var noncontiguousObjectUpdateCount = makeNoncontiguousObjectUpdates ? ko.observable(0) : undefined;
updateFromModel: function fnUpdateFromModel(viewmodel, model, makeNonContiguousObjectUpdates) {
var nonContiguousObjectUpdateCount = makeNonContiguousObjectUpdates ? ko.observable(0) : undefined;
initInternals(this.options, "Update From Model");
return recursiveUpdate(model, viewmodel, rootContext, undefined, noncontiguousObjectUpdateCount);
return recursiveUpdate(model, viewmodel, rootContext, undefined, nonContiguousObjectUpdateCount);
}
};
}());