Merge pull request #710 from vampiricwulf/master

minor fixes
This commit is contained in:
Brandon T. 2014-05-02 23:35:41 -07:00
commit 47f7c5fde4
5 changed files with 15 additions and 14 deletions

View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.9.20 - 2014-04-21 * appchan x - Version 2.9.20 - 2014-05-02
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2020,7 +2020,8 @@ a:only-of-type > .remove {
.hide-ads .topad, .hide-ads .topad,
.hide-ads .middlead, .hide-ads .middlead,
.hide-ads .bottomad, .hide-ads .bottomad,
.hide-ads .ad-plea { .hide-ads .ad-plea,
.hide-ads .center {
display: none; display: none;
} }
.shrink-ads .topad a img, .shrink-ads .topad a img,

View File

@ -284,7 +284,7 @@ QR =
QR.open() QR.open()
QR.handleFiles files QR.handleFiles files
$.addClass QR.nodes.el, 'dump' $.addClass QR.nodes.el, 'dump'
handleBlob: (urlBlob, header, url) -> handleBlob: (urlBlob, header, url) ->
name = url.substr(url.lastIndexOf('/')+1, url.length) name = url.substr(url.lastIndexOf('/')+1, url.length)
#QUALITY coding at work #QUALITY coding at work
@ -421,7 +421,7 @@ QR =
else else
'new' 'new'
list.nextElementSibling.firstChild.textContent = list.options[list.selectedIndex].textContent if $.hasClass list, 'riced' list.nextElementSibling.firstChild.textContent = list.options[list.selectedIndex].textContent if $.hasClass list, 'riced'
dialog: -> dialog: ->
QR.nodes = nodes = QR.nodes = nodes =
@ -455,7 +455,7 @@ QR =
setNode 'spoilerPar', '#qr-spoiler-label' setNode 'spoilerPar', '#qr-spoiler-label'
setNode 'status', '[type=submit]' setNode 'status', '[type=submit]'
setNode 'fileInput', '[type=file]' setNode 'fileInput', '[type=file]'
rules = $('ul.rules').textContent.trim() rules = $('ul.rules').textContent.trim()
QR.min_width = QR.min_heigth = 1 QR.min_width = QR.min_heigth = 1
QR.max_width = QR.max_heigth = 5000 QR.max_width = QR.max_heigth = 5000
@ -568,8 +568,8 @@ QR =
name: 'flag' name: 'flag'
className: 'flagSelector' className: 'flagSelector'
fn = (val) -> fn = (val) ->
$.add select, $.el 'option', $.add select, $.el 'option',
value: val[0] value: val[0]
textContent: val[1] textContent: val[1]
@ -706,7 +706,7 @@ QR =
QR.error $.el 'span', QR.error $.el 'span',
innerHTML: """ innerHTML: """
Connection error. You may have been <a href=//www.4chan.org/banned target=_blank>banned</a>. Connection error. You may have been <a href=//www.4chan.org/banned target=_blank>banned</a>.
[<a href="https://github.com/seaweedchan/4chan-x/wiki/Frequently-Asked-Questions#what-does-4chan-x-encountered-an-error-while-posting-please-try-again-mean" target=_blank>?</a>] [<a href="https://github.com/MayhemYDG/4chan-x/wiki/FAQ#what-does-connection-error-you-may-have-been-banned-mean" target=_blank>?</a>]
""" """
extra = extra =
form: $.formData formData form: $.formData formData