Merge branch 'master' of github.com:szwacz/nedb into szwacz-master

lib/model.js

@@ -5,9 +5,7 @@
  * Querying, update
  */
 
-var dateToJSON = function () { return { $$date: this.getTime() }; }
+var util = require('util')
-  , originalDateToJSON = Date.prototype.toJSON
-  , util = require('util')
   , _ = require('underscore')
   , modifierFunctions = {}
   , lastStepModifierFunctions = {}
@@ -66,22 +64,21 @@ function checkObject (obj) {
  */
 function serialize (obj) {
   var res;
-
+  
-  // Keep track of the fact that this is a Date object
-  Date.prototype.toJSON = dateToJSON;
-
   res = JSON.stringify(obj, function (k, v) {
     checkKey(k, v);
+    
+    if (v === undefined) { return undefined; }
+    if (v === null) { return null; }
 
-    if (typeof v === undefined) { return null; }
+    // Hackish way of checking if object is Date (this way it works between execution contexts in node-webkit).
-    if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean' || v === null) { return v; }
+    // We can't use value directly because for dates it is already string in this function (date.toJSON was already called),
+    // fortunately "this" is bound here to object which is owner of the key.
+    if (typeof this[k].getTime === 'function') { return { $$date: this[k].getTime() }; }
 
     return v;
   });
 
-  // Return Date to its original state
-  Date.prototype.toJSON = originalDateToJSON;
-
   return res;
 }