From 5bda49fb7923836e2c8d95ae135df7d08bedf3ef Mon Sep 17 00:00:00 2001 From: James Campos Date: Sat, 31 Dec 2011 13:32:52 -0800 Subject: [PATCH] don't expand image or inline quote if e.metaKey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit on osx, command(⌘)+click opens links in new tabs. e.metaKey is true when command is held. --- 4chan_x.user.js | 8 ++++++-- script.coffee | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4f3bd78a7..c01bdd971 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2457,7 +2457,9 @@ }, toggle: function(e) { var id; - if (e.shiftKey || e.altKey || e.ctrlKey || e.button !== 0) return; + if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0) { + return; + } e.preventDefault(); id = this.hash.slice(1); if (/\binlined\b/.test(this.className)) { @@ -2933,7 +2935,9 @@ }, cb: { toggle: function(e) { - if (e.shiftKey || e.altKey || e.ctrlKey || e.button !== 0) return; + if (e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0) { + return; + } e.preventDefault(); return imgExpand.toggle(this); }, diff --git a/script.coffee b/script.coffee index e0f7f2083..637ad3bd8 100644 --- a/script.coffee +++ b/script.coffee @@ -1944,7 +1944,7 @@ quoteInline = quote.removeAttribute 'onclick' $.on quote, 'click', quoteInline.toggle toggle: (e) -> - return if e.shiftKey or e.altKey or e.ctrlKey or e.button isnt 0 + return if e.shiftKey or e.altKey or e.ctrlKey or e.metaKey or e.button isnt 0 e.preventDefault() id = @hash[1..] if /\binlined\b/.test @className @@ -2279,7 +2279,7 @@ imgExpand = imgExpand.expand a.firstChild cb: toggle: (e) -> - return if e.shiftKey or e.altKey or e.ctrlKey or e.button isnt 0 + return if e.shiftKey or e.altKey or e.ctrlKey or e.metaKey or e.button isnt 0 e.preventDefault() imgExpand.toggle @ all: ->