mirror of
https://github.com/amark/gun.git
synced 2025-03-30 15:08:33 +00:00
It works. The world IS changed.
This commit is contained in:
parent
a372951a53
commit
9e976b24a1
@ -110,21 +110,21 @@
|
||||
<p>A mysterious new example app has appeared! It is not finished/ready yet.</p>
|
||||
</div id="info">
|
||||
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/examples/jquery.js"></script>
|
||||
<!-- script src="/Users/mark/Dropbox/Public/gun/db/examples/jquery.js"></script>
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/gun.js"></script>
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/lib/cryptomodules.js"></script>
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/sea.js"></script>
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/as.js"></script>
|
||||
<script src="/Users/mark/Dropbox/Public/gun/db/as.js"></script -->
|
||||
|
||||
<!-- script src="/jquery.js"></script>
|
||||
<script src="/jquery.js"></script>
|
||||
<script src="/gun.js"></script>
|
||||
<script src="/gun/lib/cryptomodules.js"></script>
|
||||
<script src="/gun/sea.js"></script>
|
||||
<script src="/gun/as.js"></script -->
|
||||
<script src="/gun/as.js"></script>
|
||||
<script>
|
||||
var gun = Gun('http://localhost:8080/gun'); // DOESN'T WORK YET :(
|
||||
var gun = Gun(location.origin+'/gun');
|
||||
//var gun = Gun();
|
||||
var app = gun.get('example/contacts/5');
|
||||
var app = gun.get('example/contacts/6');
|
||||
var user = gun.user();
|
||||
var c = window.c = {};
|
||||
(function(){
|
||||
|
9
gun.js
9
gun.js
@ -745,7 +745,10 @@
|
||||
}
|
||||
function merge(node, soul){
|
||||
var ctx = this, cat = ctx.gun._, at = (cat.next || empty)[soul];
|
||||
if(!at){ return }
|
||||
if(!at){
|
||||
ctx.souls[soul] = false;
|
||||
return
|
||||
}
|
||||
var msg = ctx.map[soul] = {
|
||||
put: node,
|
||||
get: soul,
|
||||
@ -783,7 +786,6 @@
|
||||
function map(msg, soul){
|
||||
if(!msg.gun){ return }
|
||||
msg.gun._.root._.stop = {};
|
||||
//console.log("map ->", soul, msg.put);
|
||||
(msg.gun._).on('in', msg);
|
||||
msg.gun._.root._.stop = {};
|
||||
}
|
||||
@ -864,7 +866,7 @@
|
||||
//console.log("<<<<<", msg.put);
|
||||
to.next(msg);
|
||||
},1);
|
||||
})
|
||||
});
|
||||
});*/
|
||||
})(require, './root');
|
||||
|
||||
@ -1372,7 +1374,6 @@
|
||||
var tmp = cat.root._.now; obj.del(cat.root._, 'now');
|
||||
var tmp2 = cat.root._.stop;
|
||||
(as.ref._).now = true;
|
||||
//console.log('PUT!', as.env.graph);
|
||||
(as.ref._).on('out', {
|
||||
gun: as.ref, put: as.out = as.env.graph, opt: as.opt, '#': ask
|
||||
});
|
||||
|
@ -173,7 +173,6 @@ describe("Make sure SEA syncs correctly", function(){
|
||||
test.async();
|
||||
console.log(window.count);
|
||||
setTimeout(function(){
|
||||
console.log("!!!!!!!!!!!!!!!!!!!!!!!!", window.count);
|
||||
if('AAA' === window.count[1].what){
|
||||
test.done();
|
||||
}
|
||||
|
@ -199,7 +199,6 @@ describe("Make sure SEA syncs correctly", function(){
|
||||
window.gun = gun;
|
||||
var user = window.user = gun.user();
|
||||
user.auth('alice', 'xyzabcmnopq', function(ack){
|
||||
console.log("????", ack);
|
||||
if(ack.err || !ack.pub){ return }
|
||||
test.done();
|
||||
});
|
||||
@ -224,11 +223,10 @@ describe("Make sure SEA syncs correctly", function(){
|
||||
test.async();
|
||||
console.log(window.count);
|
||||
setTimeout(function(){
|
||||
console.log("!!!!!!!!!!!!!!!!!!!!!!!!", window.count);
|
||||
if('AAA' === window.count[1].what){
|
||||
test.done();
|
||||
}
|
||||
}, 100);
|
||||
}, 1200);
|
||||
});
|
||||
});
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user