Merge branch 'v3'
Conflicts: builds/appchan-x.user.js builds/crx/script.js
This commit is contained in:
commit
1f9d5e2221
@ -8984,7 +8984,11 @@
|
||||
QR.cleanNotifications();
|
||||
for (_i = 0, _len = files.length; _i < _len; _i++) {
|
||||
file = files[_i];
|
||||
QR.checkDimensions(file, isSingle, max);
|
||||
if (file.type === 'application/x-shockwave-flash') {
|
||||
QR.handleFile(file, isSingle, max);
|
||||
} else {
|
||||
QR.checkDimensions(file, isSingle, max);
|
||||
}
|
||||
}
|
||||
if (!isSingle) {
|
||||
return $.addClass(QR.nodes.el, 'dump');
|
||||
|
||||
@ -9039,7 +9039,11 @@
|
||||
QR.cleanNotifications();
|
||||
for (_i = 0, _len = files.length; _i < _len; _i++) {
|
||||
file = files[_i];
|
||||
QR.checkDimensions(file, isSingle, max);
|
||||
if (file.type === 'application/x-shockwave-flash') {
|
||||
QR.handleFile(file, isSingle, max);
|
||||
} else {
|
||||
QR.checkDimensions(file, isSingle, max);
|
||||
}
|
||||
}
|
||||
if (!isSingle) {
|
||||
return $.addClass(QR.nodes.el, 'dump');
|
||||
|
||||
@ -364,7 +364,10 @@ QR =
|
||||
isSingle = files.length is 1
|
||||
QR.cleanNotifications()
|
||||
for file in files
|
||||
QR.checkDimensions file, isSingle, max
|
||||
if file.type is 'application/x-shockwave-flash'
|
||||
QR.handleFile(file, isSingle, max)
|
||||
else
|
||||
QR.checkDimensions file, isSingle, max
|
||||
$.addClass QR.nodes.el, 'dump' unless isSingle
|
||||
|
||||
checkDimensions: (file, isSingle, max) ->
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user