aniani/brutaldon
1
0
Fork 0
mirror of https://gitlab.com/brutaldon/brutaldon.git synced 2024-06-15 17:35:23 +00:00
Code

Restore all of the PJAX stuff because I figured out what was going wrong

Browse Source
This commit is contained in:
Jason McBrayer 2018-11-06 17:05:03 -05:00
parent 9eda3c91cb
commit 347ccb4bbe
5 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
brutaldon/static/js/brutaldon-enhancements.js
View File

@ -151,3 +151,21 @@ function characterCount()
return $("#id_status").val().length + $("#id_spoiler_text").val().length;
}
function savePlace()
{
sessionStorage.setItem("lastScrollPos", window.scrollY);
return true;
}
function restorePlace(ev)
{
var lastScrollPos = sessionStorage.getItem('lastScrollPos');
Intercooler.ready(function (elt)
{
if (elt[0].id == 'main')
{
window.scrollTo(0, lastScrollPos);
}
});
return false;
}

74
brutaldon/templates/base.html
View File

@ -75,17 +75,32 @@
<div class="navbar-menu is-active" id="navMenu">
<!-- navbar start, navbar end -->
<div class="navbar-start">
<a href="{% url "home" %}" class="navbar-item">
<a href="{% url "home" %}" class="navbar-item"
ic-get-from="{% url "home" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-on-success="afterPage('{{ own_acct.username }}', 'Home');"
ic-select-from-response="#main"
ic-indicator="#page-load-indicator">
<span class="fa fa-home"></span>
<span>&nbsp; Home</span>
</a>
<a class="navbar-item" href="{% url "note" %}"
>
ic-get-from="{% url "note" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-indicator="#page-load-indicator" ic-on-success="afterPage('{{ own_acct.username }}', 'Notifications');">
<span class="fa fa-bell-o"></span>
{% if preferences.notifications and not preferences.theme.is_brutalist %}
<span ic-src="{% url 'notes_count' %}"
ic-poll="{{ preferences.poll_frequency }}s"
ic-target="this">
ic-target="this"
ic-select-from-response="#notes-count">
<span
{% if notifications and notifications != '0' %}
class="badge"
@ -95,19 +110,36 @@
</span>
{% elif notifications and preferences.notifications %}
<span ic-src="{% url 'notes_count' %}"
ic-poll="60s"
ic-target="this">
ic-poll="{{ preferences.poll_frequency }}"
ic-target="this"
ic-select-from-response="#notes-count">
<span >&nbsp; Notifications ({{ notifications }})</span>
</span>
{% else %}
<span >&nbsp; Notifications</span>
{% endif %}
</a>
<a class="navbar-item" href="{% url "local" %}">
<a class="navbar-item" href="{% url "local" %}"
ic-get-from="{% url "local" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-indicator="#page-load-indicator"
ic-on-success="afterPage('{{ own_acct.username }}', 'Local timeline');">
<span class="fa fa-community"></span>
<span >&nbsp; Local</span>
</a>
<a class="navbar-item" href="{% url "fed" %}">
<a class="navbar-item" href="{% url "fed" %}"
ic-get-from="{% url "fed" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-indicator="#page-load-indicator"
ic-on-success="afterPage('{{ own_acct.username }}', 'Federated timeline');">
<span class="fa fa-globe"></span>
<span >&nbsp;Federated</span>
</a>
@ -118,17 +150,35 @@
<span class="fa fa-edit"> </span>
<span >&nbsp; New Toot</span>
</a>
<a class="navbar-item" href="{% url "search" %}">
<a class="navbar-item" href="{% url "search" %}"
ic-get-from="{% url "search" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-indicator="#page-load-indicator"
ic-on-success="afterPage('{{ own_acct.username }}', 'Search');">
<span class="fa fa-search"> </span>
<span >&nbsp; Search</span>
</a>
</div>
<div class="navbar-end" >
<a class="navbar-item" href="{% url "settings" %}">
<a class="navbar-item" href="{% url "settings" %}"
ic-get-from="{% url "settings" %}"
ic-target="#main"
ic-scroll-to-target="true"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-indicator="#page-load-indicator"
ic-on-success="afterPage('{{ own_acct.username }}', 'Settings');">
<span class="fa fa-gear"></span>
<span >&nbsp;Settings</span>
</a>
<a class="navbar-item" href="{% url "logout" %}">
<a class="navbar-item" href="{% url "logout" %}"
ic-get-from="{% url "logout" %}"
ic-confirm="Are you sure you want to log out?">
<span class="fa fa-power-off"></span>
<span >&nbsp;Log out</span>
</a>
@ -139,7 +189,7 @@
</nav>
{% endblock %}
<section id="main" class="section">
<section id="main" class="section" ic-history-elt="true">
<div class="container">
{% block content %}
<h1 class="title">
@ -181,6 +231,8 @@
<script type="application/javascript">
$(document).ready(function () {
menuPrepare();
$(document).on('handle.onpopstate.ic',
restorePlace);
});
{% if preferences.lightbox %}

2
brutaldon/templates/intercooler/notes.html
View File

@ -1,3 +1,4 @@
<span id="notes-count">
{% if not preferences.theme.is_brutalist %}
<span
{% if notifications and notifications != '0' %}
@ -9,3 +10,4 @@
{% else %}
<span >&nbsp; Notifications ({{ notifications }})</span>
{% endif %}
</span>

9
brutaldon/templates/main/toot_partial.html
View File

@ -166,7 +166,14 @@
{% endif %}
{{ toot.visibility }}
&nbsp;&nbsp;
<a class="level-item" href="{% url "thread" toot.id %}">
<a class="level-item" href="{% url "thread" toot.id %}"
ic-get-from="{% url "thread" toot.id %}"
ic-target="#main"
ic-select-from-response="#main"
ic-push-url="true"
ic-on-beforeSend="savePlace"
ic-on-success="afterPage('{{ own_acct.username }}', 'thread');"
ic-indicator="#page-load-indicator">
thread
</a>
</div>

1
brutaldon/views.py
View File

@ -401,6 +401,7 @@ def settings(request):
account.preferences.notifications = form.cleaned_data['notifications']
account.preferences.click_to_load = form.cleaned_data['click_to_load']
account.preferences.lightbox = form.cleaned_data['lightbox']
account.preferences.poll_frequency = form.cleaned_data['poll_frequency']
request.session['timezone'] = account.preferences.timezone
account.preferences.save()
account.save()