Put logical operators where they belong, in match

pull/2/head
Louis Chatriot 11 years ago
parent 46da2f0a5f
commit 04dd0d3a9c
  1. 17
      lib/model.js
  2. 4
      test/model.test.js

@ -131,6 +131,20 @@ function deepCopy (obj) {
} }
/**
* Tells if an object is a primitive type or a "real" object
* Arrays are considered primitive
*/
function isPrimitiveType (obj) {
return ( typeof obj === 'boolean' ||
typeof obj === 'number' ||
typeof obj === 'string' ||
obj === null ||
util.isDate(obj) ||
util.isArray(obj));
}
/** /**
* Utility functions for comparing things * Utility functions for comparing things
* Assumes type checking was already done (a and b already have the same type) * Assumes type checking was already done (a and b already have the same type)
@ -631,8 +645,7 @@ function match (obj, query) {
*/ */
function matchQueryPart (obj, queryKey, queryValue) { function matchQueryPart (obj, queryKey, queryValue) {
var objValue = getDotValue(obj, queryKey) var objValue = getDotValue(obj, queryKey)
, i , i, keys, firstChars, dollarFirstChars
, keys, firstChars, dollarFirstChars
; ;
// Check if the object value is an array treat it as an array of { obj, query } // Check if the object value is an array treat it as an array of { obj, query }

@ -166,6 +166,10 @@ describe('Model', function () {
model.checkObject(obj); model.checkObject(obj);
}); });
it.only('Can check if an object is a primitive or not', function () {
});
}); // ==== End of 'Object checking' ==== // }); // ==== End of 'Object checking' ==== //

Loading…
Cancel
Save