Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into qr

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-01 02:54:24 +01:00
commit e1cc2309a1
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
4chan_x.user.js
View File

@ -2248,7 +2248,9 @@ textarea.field {\
}, },
toggle: function(e) { toggle: function(e) {
var id; 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(); e.preventDefault();
id = this.hash.slice(1); id = this.hash.slice(1);
if (/\binlined\b/.test(this.className)) { if (/\binlined\b/.test(this.className)) {
@ -2724,7 +2726,9 @@ textarea.field {\
}, },
cb: { cb: {
toggle: function(e) { 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(); e.preventDefault();
return imgExpand.toggle(this); return imgExpand.toggle(this);
}, },

4
script.coffee
View File

@ -1745,7 +1745,7 @@ quoteInline =
quote.removeAttribute 'onclick' quote.removeAttribute 'onclick'
$.on quote, 'click', quoteInline.toggle $.on quote, 'click', quoteInline.toggle
toggle: (e) -> 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() e.preventDefault()
id = @hash[1..] id = @hash[1..]
if /\binlined\b/.test @className if /\binlined\b/.test @className
@ -2080,7 +2080,7 @@ imgExpand =
imgExpand.expand a.firstChild imgExpand.expand a.firstChild
cb: cb:
toggle: (e) -> 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() e.preventDefault()
imgExpand.toggle @ imgExpand.toggle @
all: -> all: ->