Merge branch 'v3'

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-04-02 19:17:49 -07:00
commit 1f9d5e2221
3 changed files with 14 additions and 3 deletions

View File

@ -8984,8 +8984,12 @@
QR.cleanNotifications(); QR.cleanNotifications();
for (_i = 0, _len = files.length; _i < _len; _i++) { for (_i = 0, _len = files.length; _i < _len; _i++) {
file = files[_i]; file = files[_i];
if (file.type === 'application/x-shockwave-flash') {
QR.handleFile(file, isSingle, max);
} else {
QR.checkDimensions(file, isSingle, max); QR.checkDimensions(file, isSingle, max);
} }
}
if (!isSingle) { if (!isSingle) {
return $.addClass(QR.nodes.el, 'dump'); return $.addClass(QR.nodes.el, 'dump');
} }

View File

@ -9039,8 +9039,12 @@
QR.cleanNotifications(); QR.cleanNotifications();
for (_i = 0, _len = files.length; _i < _len; _i++) { for (_i = 0, _len = files.length; _i < _len; _i++) {
file = files[_i]; file = files[_i];
if (file.type === 'application/x-shockwave-flash') {
QR.handleFile(file, isSingle, max);
} else {
QR.checkDimensions(file, isSingle, max); QR.checkDimensions(file, isSingle, max);
} }
}
if (!isSingle) { if (!isSingle) {
return $.addClass(QR.nodes.el, 'dump'); return $.addClass(QR.nodes.el, 'dump');
} }

View File

@ -364,6 +364,9 @@ QR =
isSingle = files.length is 1 isSingle = files.length is 1
QR.cleanNotifications() QR.cleanNotifications()
for file in files for file in files
if file.type is 'application/x-shockwave-flash'
QR.handleFile(file, isSingle, max)
else
QR.checkDimensions file, isSingle, max QR.checkDimensions file, isSingle, max
$.addClass QR.nodes.el, 'dump' unless isSingle $.addClass QR.nodes.el, 'dump' unless isSingle