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

Ensure mascot element is passed around correctly

Browse Source
This commit is contained in:
Zixaphir 2013-06-03 13:36:40 -07:00
parent dcac62d45e
commit af48ff03ea
6 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builds/appchan-x.js
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

30
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

2
src/General/css/layout.css
View File

@ -1659,6 +1659,8 @@ a:only-of-type > .remove {
bottom: 100%; bottom: 100%;
margin-bottom: -2px; margin-bottom: -2px;
} }
.mascot-position-above-post-form.post-form-style-fixed.post-form-decorations #qr #mascot,
.mascot-position-above-post-form.post-form-style-transparent-fade.post-form-decorations #qr #mascot,
.mascot-position-default.post-form-style-fixed.post-form-decorations #qr #mascot, .mascot-position-default.post-form-style-fixed.post-form-decorations #qr #mascot,
.mascot-position-default.post-form-style-transparent-fade.post-form-decorations #qr #mascot { .mascot-position-default.post-form-style-transparent-fade.post-form-decorations #qr #mascot {
margin-bottom: 1px; margin-bottom: 1px;

2
src/General/html/Settings/Settings.html
View File

@ -8,7 +8,7 @@
<a href='<%= meta.page %>' target=_blank><%= meta.name %></a> | <a href='<%= meta.page %>' target=_blank><%= meta.name %></a> |
<a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md' target=_blank>#{g.VERSION}</a> | <a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md' target=_blank>#{g.VERSION}</a> |
<a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/README.md#reporting-bugs-and-suggestions' target=_blank>Issues</a> | <a href='<%= meta.repo %>blob/<%= meta.mainBranch %>/README.md#reporting-bugs-and-suggestions' target=_blank>Issues</a> |
<a href=javascript:; class=close title=Close>×</a> <a href=javascript:; class=close title=Close>✖</a>
</div> </div>
</nav> </nav>
<hr> <hr>

22
src/Posting/QuickReply.coffee
View File

@ -76,14 +76,17 @@ QR =
if QR.nodes if QR.nodes
QR.nodes.el.hidden = false QR.nodes.el.hidden = false
QR.unhide() QR.unhide()
return else
try try
QR.dialog() QR.dialog()
catch err catch err
delete QR.nodes delete QR.nodes
Main.handleErrors Main.handleErrors
message: 'Quick Reply dialog creation crashed.' message: 'Quick Reply dialog creation crashed.'
error: err error: err
if MascotTools.el and ['default', 'above post form'].contains(Conf['Mascot Position']) and
['fixed', 'transparent fade'].contains Conf['Post Form Style']
$.add QR.nodes.el, MascotTools.el
close: -> close: ->
if QR.req if QR.req
@ -1009,9 +1012,6 @@ QR =
Rice.nodes dialog Rice.nodes dialog
if MascotTools.el and Conf['Mascot Position'] is 'default' and ['fixed', 'transparent fade'].contains Conf['Post Form Style']
$.add dialog, MascotTools.el
$.add d.body, dialog $.add d.body, dialog
if Conf['Auto Hide QR'] if Conf['Auto Hide QR']