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

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Browse Source 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
This commit is contained in:
Zixaphir 2013-08-24 12:20:01 -07:00
commit c31e9cde8d
4 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builds/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

19
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

7
src/General/css/style.css
View File

@ -1109,6 +1109,7 @@ a:only-of-type > .remove {
<%= flex %>-direction: column;
<%= align %>-items: stretch;
text-align: center;
background: rgba(0,0,0,.5);
}
.hide-thumbnails .gal-thumbnails {
display: none;
@ -1123,12 +1124,10 @@ a:only-of-type > .remove {
<%= flex %>: 0 0 auto;
padding: 3px;
line-height: 0;
transition: background .3s linear;
background: rgba(0,0,0,.5);
border-left: 1px solid #222;
transition: background .2s linear;
}
.gal-highlight {
background: rgb(190, 190, 255);
background: rgba(0, 190, 255,.8);
}
.gal-prev {
order: 0;

11
src/Posting/QuickReply.coffee
View File

@ -495,7 +495,16 @@ QR =
post = new QR.post()
post.setFile file
openFileInput: ->
openFileInput: (e) ->
e.stopPropagation()
if e.shiftKey and e.type is 'click'
return QR.selected.rmFile()
if e.ctrlKey and e.type is 'click'
$.addClass QR.nodes.filename, 'edit'
QR.nodes.filename.focus()
return $.on QR.nodes.filename, 'blur', -> $.rmClass QR.nodes.filename, 'edit'
return if e.target.nodeName is 'INPUT' or (e.keyCode and not [32, 13].contains e.keyCode) or e.ctrlKey
e.preventDefault()
QR.nodes.fileInput.click()
posts: []