From b57a7a8013a9548d0b566b9d2fd3d8bb2fa69842 Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Fri, 22 Nov 2019 03:10:54 -0800 Subject: [PATCH] Update meta.js --- lib/meta.js | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/meta.js b/lib/meta.js index 8d75b503..9f8a98df 100644 --- a/lib/meta.js +++ b/lib/meta.js @@ -30,7 +30,7 @@ var key = (k.eve = m.eve = eve).which = eve.which || eve.fake || eve.keyCode; // 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(!eve.fake && key === k.last){ return }; k.last = key; // jussi: polyfilling eve.repeat? @@ -131,7 +131,8 @@ eve.preventDefault(); cb($put.val()); $li.remove(); - k.wipe(); + //k.wipe(); + m.list(k.at); }); var $li = $('
  • ').append($form); $ul.append($li); @@ -147,7 +148,7 @@ m.tap = function(){ var on = $('.meta-on') .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; } meta.edit = function(edit){ @@ -421,19 +422,19 @@ ;USE(function(module){ var m = meta, k = m.key; $(window).on('blur', k.wipe.bind(null, false)).on('focus', k.wipe.bind(null, false)); - //$(document).on('mousedown mousemove mouseup', function(eve){ - // m.tap.eve = eve; - // m.tap.x = eve.pageX||0; - // m.tap.y = eve.pageY||0; - // m.tap.on = $(eve.target); - //}) - // Setting m.tap.edit has been commented, so should never end up here? - //.on('mousedown touchstart', function(eve){ - // var tmp = m.tap.edit; - // if(!tmp || !tmp.on){ return } - // tmp.on(eve); - // m.tap.edit = null; - //}); + $(document).on('mousedown mousemove mouseup', function(eve){ + m.tap.eve = eve; + m.tap.x = eve.pageX||0; + m.tap.y = eve.pageY||0; + m.tap.on = $(eve.target); + }) + /*// Setting m.tap.edit has been commented, so should never end up here? + .on('mousedown touchstart', function(eve){ + var tmp = m.tap.edit; + if(!tmp || !tmp.on){ return } + tmp.on(eve); + m.tap.edit = null; + });*/ //$(document).on('touchstart', '#meta .meta-start', function(eve){ m.tap.stun = true });