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

Merge branch 'v3'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/appchan-x.user.js
View File

@ -8984,7 +8984,11 @@
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];
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) { if (!isSingle) {
return $.addClass(QR.nodes.el, 'dump'); return $.addClass(QR.nodes.el, 'dump');

6
builds/crx/script.js
View File

@ -9039,7 +9039,11 @@
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];
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) { if (!isSingle) {
return $.addClass(QR.nodes.el, 'dump'); return $.addClass(QR.nodes.el, 'dump');

5
src/Posting/QR.coffee
View File

@ -364,7 +364,10 @@ QR =
isSingle = files.length is 1 isSingle = files.length is 1
QR.cleanNotifications() QR.cleanNotifications()
for file in files 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 $.addClass QR.nodes.el, 'dump' unless isSingle
checkDimensions: (file, isSingle, max) -> checkDimensions: (file, isSingle, max) ->