').attr('id', 'meta');
+ $m.append($('
').text('+').addClass('meta-start'));
+ $m.append($('').addClass('meta-menu meta-none').append('
'));
+ $(document.body).append($m);
+ css({
+ '#meta': {
+ display: 'block',
+ position: 'fixed',
+ bottom: '2em',
+ right: '2em',
+ background: 'white',
+ 'font-size': '18pt',
+ 'font-family': 'Tahoma, arial',
+ 'box-shadow': '0px 0px 1px #000044',
+ 'border-radius': '1em',
+ 'text-align': 'center',
+ 'z-index': 999999,
+ margin: 0,
+ padding: 0,
+ width: '2em',
+ height: '2em',
+ opacity: 0.7,
+ color: '#000044',
+ overflow: 'visible',
+ transition: 'all 0.2s ease-in'
+ },
+ '#meta .meta-none': {display: 'none'},
+ '#meta span': {'line-height': '2em'},
+ '#meta .meta-menu': {
+ background: 'rgba(0,0,0,0.1)',
+ width: '12em',
+ right: '-2em',
+ bottom: '-2em',
+ overflow: 'visible',
+ position: 'absolute',
+ 'overflow-y': 'scroll',
+ 'text-align': 'right',
+ 'min-height': '20em',
+ height: '100vh'
+ },
+ '#meta .meta-menu ul': {
+ padding: 0,
+ margin: '1em 1em 2em 0',
+ 'list-style-type': 'none'
+ },
+ '#meta .meta-menu ul li': {
+ display: 'block',
+ background: 'white',
+ padding: '0.5em 1em',
+ 'border-radius': '1em',
+ 'margin-left': '0.25em',
+ 'margin-top': '0.25em',
+ 'float': 'right'
+ },
+ '#meta a': {color: 'black'},
+ '#meta:hover': {opacity: 1},
+ '#meta .meta-menu ul:before': {
+ content: "' '",
+ display: 'block',
+ 'min-height': '15em',
+ height: '50vh'
+ },
+ '#meta li': {
+ background: 'white',
+ padding: '0.5em 1em',
+ 'border-radius': '1em',
+ 'margin-left': '0.25em',
+ 'margin-top': '0.25em',
+ 'float': 'right'
+ },
+ '#meta:hover .meta-menu': {display: 'block'}
+ });
+ function css(css){
+ var tmp = '';
+ $.each(css, function(c,r){
+ tmp += c + ' {\n';
+ $.each(r, function(k,v){
+ tmp += '\t'+ k +': '+ v +';\n';
+ });
+ tmp += '}\n';
+ });
+ (node = document.createElement('style')).innerHTML = tmp;
+ document.body.appendChild(node);
+ }
+ }catch(e){}}());
+ ;(function(){
+ // on fires when shortcut keydowns or on touch after command selected and then touchdown
+ meta.edit({
+ name: "Bold",
+ combo: ['B'],
+ on: function(e){
+ meta.text.editor('bold');
+ },
+ up: function(){}
+ });
+ meta.edit({
+ name: "Italic",
+ combo: ['I'],
+ on: function(e){
+ meta.text.editor('italic');
+ },
+ up: function(){}
+ });
+ meta.edit({
+ name: "Underline",
+ combo: ['U'],
+ on: function(e){
+ meta.text.editor('underline');
+ },
+ up: function(){}
+ });
+ meta.edit({
+ name: "linK",
+ combo: ['K'],
+ up: function(e){
+ var range = meta.tap.range || monotype();
+ meta.ask('Paste or type link...', function(url){
+ meta.text.editor({tag: $('link'), edit: url? 'createLink' : 'unlink', as: url, range: range});
+ })
+ },
+ on: function(){}
+ });
+ meta.edit({name: "aliGn", combo: ['G']});
+ meta.edit({
+ name: "Left",
+ combo: ['G','L'],
+ on: function(e){ meta.text.editor('justifyLeft') },
+ up: function(){}
+ });
+ meta.edit({
+ name: "Right",
+ combo: ['G','R'],
+ on: function(e){ meta.text.editor('justifyRight') },
+ up: function(){ }
+ });
+ meta.edit({
+ name: "Middle",
+ combo: ['G','M'],
+ on: function(e){ meta.text.editor('justifyCenter') },
+ up: function(){ }
+ });
+ meta.edit({
+ name: "Justify",
+ combo: ['G','J'],
+ on: function(e){ meta.text.editor('justifyFull') },
+ up: function(){}
+ });
+ // Align Number
+ // Align Points
+ // Align Strike
+ meta.edit({name: "Size", combo: ['S']});
+ meta.edit({
+ name: "Small",
+ combo: ['S','S'],
+ on: function(e){ meta.text.editor('fontSize', 2) },
+ up: function(){ }
+ });
+ meta.edit({
+ name: "Normal",
+ combo: ['S','N'],
+ on: function(e){ meta.text.editor('fontSize', 5) },
+ up: function(){}
+ });
+ meta.edit({
+ name: "Header",
+ combo: ['S','H'],
+ on: function(e){ meta.text.editor('fontSize', 6) },
+ up: function(){}
+ });
+ meta.edit({
+ name: "Title",
+ combo: ['S','T'],
+ on: function(e){ meta.text.editor('fontSize', 7) },
+ up: function(){}
+ });
+ // Size Spacing
+ // Size Super
+ // Size Sub
+ meta.edit({name: "Edit", combo: ['E']});
+ }());
+});
\ No newline at end of file
diff --git a/lib/monotype.js b/lib/monotype.js
index fd5a50e7..3b02bf40 100644
--- a/lib/monotype.js
+++ b/lib/monotype.js
@@ -121,13 +121,12 @@
return o;
}
return monotype;
-})(function(r,opt){
- r = r || {};
+})(function(e,opt){
+ var r = {}, t, m = monotype;
opt = opt || {};
- monotype.win = opt.win || window;
- r = r.jquery || monotype.text(r)? {root: $(r)} : r;
- r.root = $(r.root || monotype.win.document.body);
- var t, m = monotype;
+ m.win = opt.win || window;
+ r = (e||r).jquery || m.text(e)? {root: $(e||m.win.document.body)} : r;
+ r.root = $(r.root || m.win.document.body);
//console.log('_______________________');
r.R = m.range(0);
r.H = {};
@@ -226,5 +225,86 @@
m.restore(R);
return r;
}
- return r;
-});
\ No newline at end of file
+ return monotype.late(r,opt);
+ //return r;
+});
+monotype.late = function(r,opt){
+ var u, m = r //monotype(r,opt)
+ , strhml = function(t){
+ return (t[0] === '<' && $(t).length)
+ }, jqtxt = function(n){
+ return n.jquery?n:(strhml(n))?$(''+n+'
').contents():$(document.createTextNode(n));
+ }
+ m.get = function(d){
+ if(u === d){ return $([m.R.startContainer, m.R.endContainer]) }
+ return monotype.deep((d = (d && d > 0))? m.R.endContainer : m.R.startContainer
+ , d? m.R.endOffset : m.R.startOffset).container;
+ }
+ m.remove = function(n,R){
+ R = m.R || m.range();
+ R.deleteContents();
+ monotype.restore(R);
+ m = monotype(m,opt);
+ return m;
+ }
+ m.insert = function(n,R){
+ n = jqtxt(n);
+ R = m.R || m.range();
+ R.deleteContents();
+ $(n.get().reverse()).each(function(){
+ R.insertNode(this);
+ });
+ R.selectNodeContents(n.last()[0]);
+ monotype.restore(R);
+ m = monotype(m,opt);
+ return m;
+ }
+ m.wrap = function(n,R){
+ var jq;
+ n = jqtxt(n);
+ n = n[0];
+ R = m.R || m.range();
+ if(monotype.text(R.startContainer) || monotype.text(R.endContainer)){
+ var b = R.cloneContents();
+ R.deleteContents();
+ jq = $(n);
+ jq.html(b);
+ jq = jq[0];
+ R.insertNode(jq);
+ }else{
+ R.surroundContents(n);
+ }
+ R.selectNodeContents(jq||n);
+ monotype.restore(R);
+ m = monotype(m,opt);
+ return m;
+ }
+ m.select = function(n,i,e,j){
+ var R = m.R || m.range(), t = e;
+ n = $(n);
+ if($.isNumeric(e)){
+ e = j || n;
+ j = t;
+ } else {
+ e = e || n;
+ }
+ j = $.isNumeric(j)? j : $.isNumeric(i)? i : Infinity;
+ i = i || 0;
+ if(i < 0){
+ t = n.contents().length || n.text().length;
+ i = t + i;
+ } if(j < 0){
+ t = n.contents().length || n.text().length;
+ j = t + j;
+ } if(j === Infinity){
+ R.selectNodeContents(n[0]);
+ } else {
+ R.setStart(n[0],i);
+ R.setEnd(e[0],j);
+ }
+ monotype.restore(R);
+ m = monotype(m,opt);
+ return m;
+ }
+ return m;
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 183c3fa7..f3c57aa0 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
{
"name": "gun",
- "version": "0.9.999998",
+ "version": "0.9.999999",
"description": "A realtime, decentralized, offline-first, graph data synchronization engine.",
"main": "index.js",
"browser": "gun.min.js",
"scripts": {
"start": "node examples/http.js 8765",
+ "https": "HTTPS_KEY=test/https/server.key HTTPS_CERT=test/https/server.crt npm start",
"prepublishOnly": "npm run unbuild",
"test": "mocha",
"testsea": "mocha test/sea.js",
@@ -48,10 +49,10 @@
"node": ">=0.8.4"
},
"dependencies": {
- "text-encoding": "^0.7.0",
"ws": "~>5.2.0"
},
"optionalDependencies": {
+ "text-encoding": "^0.7.0",
"node-webcrypto-ossl": "^1.0.39"
},
"devDependencies": {
diff --git a/test/common.js b/test/common.js
index fd4a9d53..4b754270 100644
--- a/test/common.js
+++ b/test/common.js
@@ -1264,6 +1264,15 @@ describe('Gun', function(){
describe('API', function(){
var gopt = {wire:{put:function(n,cb){cb()},get:function(k,cb){cb()}}};
+ if(Gun.window && location.search){
+ console.log("LOCALHOST PEER MUST BE ON!");
+ Gun.on('opt', function(root){
+ if(root.opt.test_no_peer){ return this.to.next(root) }
+ root.opt.peers = root.opt.peers || {};
+ root.opt.peers['http://localhost:8765/gun'] = {url: 'http://localhost:8765/gun'};
+ this.to.next(root);
+ });
+ }
var gun = Gun();
it.skip('gun chain separation', function(done){ // TODO: UNDO!
@@ -1372,7 +1381,7 @@ describe('Gun', function(){
});
describe('plural chains', function(){
- this.timeout(5000);
+ this.timeout(9000);
it('uncached synchronous map on', function(done){
/*
Biggest challenges so far:
@@ -1549,6 +1558,7 @@ describe('Gun', function(){
//expect(count.Alice).to.be(1);
//expect(count.Bob).to.be(1);
//expect(count['undefined']).to.be(1);
+ if(done.c){ return } done.c = 1;
done();
},10);
}
@@ -3580,6 +3590,7 @@ describe('Gun', function(){
});
it('Soul above but not beneath', function(done){
+ this.timeout(5000);
var gun = Gun();
var a = gun.get('sabnb');
@@ -3663,7 +3674,7 @@ describe('Gun', function(){
it('get map should not slowdown', function(done){
this.timeout(5000);
- var gun = Gun().get('g/m/no/slow');
+ var gun = Gun({test_no_peer:true}).get('g/m/no/slow');
//console.log("---------- setup data done -----------");
var prev, diff, max = 25, total = 9, largest = -1, gone = {};
//var prev, diff, max = Infinity, total = 10000, largest = -1, gone = {};
@@ -3727,6 +3738,23 @@ describe('Gun', function(){
gun.get('m/s/key').put({property: 'newValue'});
}, 1000);
});
+
+ it('Deep puts with peer should work', function(done){
+ // tests in async mode now automatically connect to localhost peer.
+ //var gun = Gun('http://localhost:8765/gun');
+ var gun = Gun();
+ //var user = gun.user();
+ //user.create('alice', 'password', function(){
+ gun.get('who').get('all').put({what: "hello world!", when: Gun.state()}, function(ack){
+ //user.get('who').get('all').put({what: "hello world!", when: Gun.state()}, function(ack){
+ gun.get('who').get('all').once(function(data){
+ expect(data.what).to.be.ok();
+ expect(data.when).to.be.ok();
+ done();
+ });
+ });
+ //});
+ });
return;
it('Nested listener should be called', function(done){
diff --git a/test/mocha.html b/test/mocha.html
index db231f5a..f09ea754 100644
--- a/test/mocha.html
+++ b/test/mocha.html
@@ -30,7 +30,7 @@
Gun.debug = true;
console.log('async?', Gun.debug);
}
- mocha.run(function(a,b,c){
+ var run = mocha.run(function(a,b,c){
//document.body.prepend("MARK! REMEMBER TO REMOVE RETURN!");return;
var yes = confirm("REFRESH BROWSER FOR ASYNC TESTS?");
if(yes){
@@ -48,6 +48,11 @@
document.getElementById('mocha-report').id = 'mocha-report2';
Gun.debug = false;
mocha.run();*/
- })
+ });
+ run.on("fail", function(test, err){
+ console.log("!!!!!!!!!!!", test, err);
+ //alert(5);
+ })
+