Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-06 14:16:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update meta.js

Browse Source
This commit is contained in:
Mark Nadal 2019-11-22 03:10:54 -08:00
parent 22547099bd
commit b57a7a8013
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/meta.js
View File

@ -30,7 +30,7 @@
var key = (k.eve = m.eve = eve).which = eve.which || eve.fake || eve.keyCode; var key = (k.eve = m.eve = eve).which = eve.which || eve.fake || eve.keyCode;
// ADDED // ADDED
if(!m.flip.is() && !k.meta[key]){ return } // cancel non-open events when closed TODO make optional //if(!m.flip.is() && !k.meta[key]){ return } // cancel non-open events when closed TODO make optional
if(!k.meta[key] && withMeta(eve) && !k.at[key]) { return m.flip(false) } // cancel and close when no action and "meta key" held down (e.g. ctrl+c) if(!k.meta[key] && withMeta(eve) && !k.at[key]) { return m.flip(false) } // cancel and close when no action and "meta key" held down (e.g. ctrl+c)
if(!eve.fake && key === k.last){ return }; k.last = key; // jussi: polyfilling eve.repeat? if(!eve.fake && key === k.last){ return }; k.last = key; // jussi: polyfilling eve.repeat?
@ -131,7 +131,8 @@
eve.preventDefault(); eve.preventDefault();
cb($put.val()); cb($put.val());
$li.remove(); $li.remove();
k.wipe(); //k.wipe();
m.list(k.at);
}); });
var $li = $('<li>').append($form); var $li = $('<li>').append($form);
$ul.append($li); $ul.append($li);
@ -147,7 +148,7 @@
m.tap = function(){ m.tap = function(){
var on = $('.meta-on') var on = $('.meta-on')
.or($($(document.querySelectorAll(':hover')).get().reverse()).first()) .or($($(document.querySelectorAll(':hover')).get().reverse()).first())
.or($(document.elementFromPoint(meta.tap.x, meta.tap.y))); .or($(document.elementFromPoint(meta.tap.x||0, meta.tap.y||0)));
return on; return on;
} }
meta.edit = function(edit){ meta.edit = function(edit){
@ -421,19 +422,19 @@
;USE(function(module){ ;USE(function(module){
var m = meta, k = m.key; var m = meta, k = m.key;
$(window).on('blur', k.wipe.bind(null, false)).on('focus', k.wipe.bind(null, false)); $(window).on('blur', k.wipe.bind(null, false)).on('focus', k.wipe.bind(null, false));
//$(document).on('mousedown mousemove mouseup', function(eve){ $(document).on('mousedown mousemove mouseup', function(eve){
// m.tap.eve = eve; m.tap.eve = eve;
// m.tap.x = eve.pageX||0; m.tap.x = eve.pageX||0;
// m.tap.y = eve.pageY||0; m.tap.y = eve.pageY||0;
// m.tap.on = $(eve.target); m.tap.on = $(eve.target);
//}) })
// Setting m.tap.edit has been commented, so should never end up here? /*// Setting m.tap.edit has been commented, so should never end up here?
//.on('mousedown touchstart', function(eve){ .on('mousedown touchstart', function(eve){
// var tmp = m.tap.edit; var tmp = m.tap.edit;
// if(!tmp || !tmp.on){ return } if(!tmp || !tmp.on){ return }
// tmp.on(eve); tmp.on(eve);
// m.tap.edit = null; m.tap.edit = null;
//}); });*/
//$(document).on('touchstart', '#meta .meta-start', function(eve){ m.tap.stun = true }); //$(document).on('touchstart', '#meta .meta-start', function(eve){ m.tap.stun = true });