Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
This commit is contained in:
Zixaphir 2014-04-05 05:39:32 -07:00
commit e5230e6457
3 changed files with 3 additions and 3 deletions

View File

@ -9071,7 +9071,7 @@
return post.setFile(file);
}
},
openFileInput: function() {
openFileInput: function(e) {
var _ref;
e.stopPropagation();
if (e.shiftKey && e.type === 'click') {

View File

@ -9126,7 +9126,7 @@
return post.setFile(file);
}
},
openFileInput: function() {
openFileInput: function(e) {
var _ref;
e.stopPropagation();
if (e.shiftKey && e.type === 'click') {

View File

@ -392,7 +392,7 @@ QR =
post.pasteText file
else
post.setFile file
openFileInput: ->
openFileInput: (e) ->
e.stopPropagation()
if e.shiftKey and e.type is 'click'
return QR.selected.rmFile()