From 0a02e7bfaaef0c49e506fb0fc7ac467f5b71d90b Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Sat, 9 Nov 2019 15:22:06 -0800 Subject: [PATCH 1/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 984120fc..fbae89e9 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,8 @@ Thanks to:
Dário Freire, John Williamson, Robin Bron, -Elie Makhoul +Elie Makhoul, +Mike Staub

- Join others in sponsoring code: https://www.patreon.com/gunDB ! From c99ad39c565f93de6cd9fbbed238a4b3e0d6cc5d Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Sat, 9 Nov 2019 15:25:23 -0800 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbae89e9..5bb40adc 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ var Gun = require('gun/gun'); If you also need to install SEA for user auth and crypto, also install some of its dependencies like this: -`npm install text-encoding node-webcrypto-ossl --save` +`npm install text-encoding @peculiar/webcrypto --save` You will need to require it too (it will be automatically added to the Gun object): From 301f8910fb11e119b4d16b80162f0472ae8b1af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jussi=20Rytk=C3=B6nen?= Date: Mon, 11 Nov 2019 17:33:22 +0200 Subject: [PATCH 3/4] meta.js update from edide --- lib/meta.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/meta.js b/lib/meta.js index 6cb610ac..c3ab5ff2 100644 --- a/lib/meta.js +++ b/lib/meta.js @@ -14,7 +14,8 @@ } } if(typeof module !== "undefined"){ var common = module } - + + /* UNBUILD */ ;USE(function(module){ var noop = function(){}, u; $.fn.or = function(s){ return this.length ? this : $(s||'body') }; @@ -145,9 +146,8 @@ ;USE(function(module){ try{ /* UI */ - if(meta.css){ return } var $m = $('
').attr('id', 'meta'); - $m.append($('').html('☰').addClass('meta-start')); + $m.append($('').text('+').addClass('meta-start')); $m.append($('
').addClass('meta-menu meta-none').append('
    ')); $(document.body).append($m); css({ @@ -159,7 +159,7 @@ background: 'white', 'font-size': '18pt', 'font-family': 'Tahoma, arial', - //'box-shadow': '0px 0px 1px #000044', + 'box-shadow': '0px 0px 1px #000044', 'border-radius': '1em', 'text-align': 'center', 'z-index': 999999, @@ -231,9 +231,10 @@ }); var tag = document.createElement('style'); tag.innerHTML = tmp; - document.body.appendChild(tag); + $m.append(tag) } - }catch(e){} + }catch(e){} + })(USE, './metaUI'); ;USE(function(module){ // include basic text editing by default. @@ -377,6 +378,8 @@ on: function(eve){ meta.text.editor('fontSize', 7) }, up: function(){} }); + + })(USE, './metaText'); ;USE(function(module){ var m = meta, k = m.key; @@ -394,10 +397,10 @@ }); $(document).on('touchstart', '#meta .meta-start', function(eve){ m.tap.stun = true }); $(document).on('click', '#meta .meta-menu li', function(eve){ - eve.fake = eve.which = $(this).data().combo.slice(-1)[0].charCodeAt(0); + var combo = $(this).data().combo; + eve.fake = eve.which = combo && combo.slice(-1)[0].charCodeAt(0); eve.tap = true; - k.down(eve); - //k.up(eve); + k.down(eve); k.up(eve); return; if(m.tap.stun){ return m.tap.stun = false } if(!(eve.fake = eve.which = (($(this).text().match(/[A-Z]/)||{})[0]||'').toUpperCase().charCodeAt(0))){ return } @@ -408,4 +411,4 @@ $(document).on('keydown', k.down).on('keyup', k.up); $(document).on('select contextmenu keyup mouseup', '[contenteditable=true]', m.text.on); })(USE, './metaEvents'); -}()); +}()); \ No newline at end of file From 5a58f77a321c070d082098e39dca94bec0733e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jussi=20Rytk=C3=B6nen?= Date: Mon, 11 Nov 2019 17:38:56 +0200 Subject: [PATCH 4/4] meta.js update from edide --- lib/meta.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/meta.js b/lib/meta.js index c3ab5ff2..f484a87b 100644 --- a/lib/meta.js +++ b/lib/meta.js @@ -14,9 +14,10 @@ } } if(typeof module !== "undefined"){ var common = module } - + /* UNBUILD */ ;USE(function(module){ + var noop = function(){}, u; $.fn.or = function(s){ return this.length ? this : $(s||'body') }; var m = window.meta = {edit:[]}; @@ -142,12 +143,14 @@ edit.combow = edit.combow.join(','); m.list(meta.edit); } + + })(USE, './metaCore'); ;USE(function(module){ try{ /* UI */ var $m = $('
    ').attr('id', 'meta'); - $m.append($('').text('+').addClass('meta-start')); + $m.append($('').html('☰').addClass('meta-start')); $m.append($('
    ').addClass('meta-menu meta-none').append('
      ')); $(document.body).append($m); css({ @@ -159,7 +162,7 @@ background: 'white', 'font-size': '18pt', 'font-family': 'Tahoma, arial', - 'box-shadow': '0px 0px 1px #000044', + //'box-shadow': '0px 0px 1px #000044', 'border-radius': '1em', 'text-align': 'center', 'z-index': 999999, @@ -231,10 +234,11 @@ }); var tag = document.createElement('style'); tag.innerHTML = tmp; - $m.append(tag) + $m.append(tag) } - }catch(e){} - + }catch(e){} + + })(USE, './metaUI'); ;USE(function(module){ // include basic text editing by default. @@ -378,8 +382,8 @@ on: function(eve){ meta.text.editor('fontSize', 7) }, up: function(){} }); - - + + })(USE, './metaText'); ;USE(function(module){ var m = meta, k = m.key; @@ -410,5 +414,7 @@ }); $(document).on('keydown', k.down).on('keyup', k.up); $(document).on('select contextmenu keyup mouseup', '[contenteditable=true]', m.text.on); + + })(USE, './metaEvents'); }()); \ No newline at end of file