atomize-server
Advanced tools
Comparing version 0.4.13 to 0.4.14
@@ -252,4 +252,6 @@ /*global require, exports */ | ||
log: function (msg) { | ||
console.log(this.connection.id + ": " + msg); | ||
log: function () { | ||
var args = Array.prototype.slice.call(arguments, 0); | ||
args.unshift(this.connection.id + ":"); | ||
console.log.apply(console, args); | ||
}, | ||
@@ -322,3 +324,3 @@ | ||
checkThing: function (thing, updates, action) { | ||
checkThing: function (thing, updates, action, checkVersion) { | ||
var ids = Object.keys(thing), | ||
@@ -334,3 +336,3 @@ ok = true, | ||
if (this.securityProvider[action](this, globalTVar, localTVar)) { | ||
if (localTVar.version !== globalTVar.version) { | ||
if (checkVersion && localTVar.version !== globalTVar.version) { | ||
updates[globalTVar.id] = true; | ||
@@ -348,7 +350,7 @@ ok = false; | ||
checkReads: function (txnLog, updates) { | ||
return this.checkThing(txnLog.read, updates, 'read'); | ||
return this.checkThing(txnLog.read, updates, 'read', true); | ||
}, | ||
checkWrites: function (txnLog, updates) { | ||
return this.checkThing(txnLog.written, updates, 'written'); | ||
return this.checkThing(txnLog.written, updates, 'written', false); | ||
}, | ||
@@ -459,6 +461,6 @@ | ||
globalTVar = this.toGlobalTVar(localIds[i]); | ||
names = Object.keys(localTVar.children); | ||
names = Object.keys(localTVar); | ||
for (j = 0; j < names.length; j += 1) { | ||
name = names[j]; | ||
desc = localTVar.children[name]; | ||
desc = localTVar[name]; | ||
if (util.hasOwnProp.call(desc, 'tvar')) { | ||
@@ -465,0 +467,0 @@ desc.value = {tvar: this.toGlobalTVarID(desc.tvar)}; |
{ | ||
"name": "atomize-server", | ||
"author": "Matthew Sackman", | ||
"version": "0.4.13", | ||
"version": "0.4.14", | ||
"repository": { | ||
@@ -13,4 +13,4 @@ "type": "git", | ||
"cereal": ">=0.2.0", | ||
"atomize-client": ">=0.4.14", | ||
"sockjs": ">=0.1.0" | ||
"atomize-client": ">=0.4.15", | ||
"sockjs": ">=0.3.0" | ||
}, | ||
@@ -17,0 +17,0 @@ "homepage": "http://atomizejs.github.com/", |
27858
579
Updatedatomize-client@>=0.4.15
Updatedsockjs@>=0.3.0