Ensure mascot element is passed around correctly

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1659,6 +1659,8 @@ a:only-of-type > .remove {
bottom: 100%;
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-transparent-fade.post-form-decorations #qr #mascot {
margin-bottom: 1px;

View File

@ -8,7 +8,7 @@
<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 %>/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>
</nav>
<hr>

View File

@ -76,14 +76,17 @@ QR =
if QR.nodes
QR.nodes.el.hidden = false
QR.unhide()
return
try
QR.dialog()
catch err
delete QR.nodes
Main.handleErrors
message: 'Quick Reply dialog creation crashed.'
error: err
else
try
QR.dialog()
catch err
delete QR.nodes
Main.handleErrors
message: 'Quick Reply dialog creation crashed.'
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: ->
if QR.req
@ -1009,9 +1012,6 @@ QR =
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
if Conf['Auto Hide QR']