forked from MarseyWorld/MarseyWorld
Kitchen sink: emoji content, assert, assetcache.
These are all minor and uncontroversial enough it just felt gross making multiple commits. - Adds marseymummified. - Changes the new `raise ValueError(...)` in badge_grant to an `assert`. - Expands assetcache to a convenient grab bag of JS files.master
parent
aea7e0b83a
commit
a8155d964a
|
@ -3,8 +3,7 @@ from files.classes.badges import Badge
|
||||||
from files.helpers.alerts import send_repeatable_notification
|
from files.helpers.alerts import send_repeatable_notification
|
||||||
|
|
||||||
def badge_grant(user, badge_id, description=None, url=None):
|
def badge_grant(user, badge_id, description=None, url=None):
|
||||||
if not user:
|
assert user != None
|
||||||
raise ValueError('badge_grant: expected user, not None')
|
|
||||||
if user.has_badge(badge_id):
|
if user.has_badge(badge_id):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -848,7 +848,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if v %}
|
{% if v %}
|
||||||
<script src="/assets/js/marked.js?v=258"></script>
|
<script src="{{asset('js/marked.js')}}"></script>
|
||||||
<script src="/assets/js/comments_v.js?v=277"></script>
|
<script src="/assets/js/comments_v.js?v=277"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
@ -354,7 +354,7 @@
|
||||||
|
|
||||||
{% if v %}
|
{% if v %}
|
||||||
<script src="/assets/js/post_toast2.js?v=243"></script>
|
<script src="/assets/js/post_toast2.js?v=243"></script>
|
||||||
<script src="/assets/js/formatting.js?v=240"></script>
|
<script src="{{asset('js/formatting.js')}}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<script src="/assets/js/lite-youtube.js?v=241"></script>
|
<script src="/assets/js/lite-youtube.js?v=241"></script>
|
||||||
|
|
|
@ -223,9 +223,9 @@
|
||||||
</script>
|
</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<script src="/assets/js/marked.js?v=258"></script>
|
<script src="{{asset('js/marked.js')}}"></script>
|
||||||
<script src="/assets/js/formatting.js?v=240"></script>
|
<script src="{{asset('js/formatting.js')}}"></script>
|
||||||
<script src="/assets/js/submit.js?v=261"></script>
|
<script src="{{asset('js/submit.js')}}"></script>
|
||||||
{% include "emoji_modal.html" %}
|
{% include "emoji_modal.html" %}
|
||||||
{% include "gif_modal.html" %}
|
{% include "gif_modal.html" %}
|
||||||
|
|
||||||
|
|
|
@ -773,7 +773,7 @@
|
||||||
</nav>
|
</nav>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<script src="/assets/js/marked.js?v=258"></script>
|
<script src="{{asset('js/marked.js')}}"></script>
|
||||||
|
|
||||||
|
|
||||||
{% if v and v.id != u.id and '/comments' not in request.path %}
|
{% if v and v.id != u.id and '/comments' not in request.path %}
|
||||||
|
|
|
@ -18,8 +18,11 @@ set CACHE_VER = {
|
||||||
'js/award_modal.js': 253,
|
'js/award_modal.js': 253,
|
||||||
'js/bootstrap.js': 259,
|
'js/bootstrap.js': 259,
|
||||||
'js/comments+submission_listing.js': 261,
|
'js/comments+submission_listing.js': 261,
|
||||||
|
'js/formatting.js': 240,
|
||||||
'js/header.js': 272,
|
'js/header.js': 272,
|
||||||
'js/lottery.js': 254,
|
'js/lottery.js': 254,
|
||||||
|
'js/marked.js': 258,
|
||||||
|
'js/submit.js': 261,
|
||||||
'js/userpage.js': 241,
|
'js/userpage.js': 241,
|
||||||
'js/userpage_v.js': 245,
|
'js/userpage_v.js': 245,
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue