octo
/
brutaldon
mirror of https://gitlab.com/brutaldon/brutaldon
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Take out the PJAX again. 

It seems initially to work with notifications, but ultimately it just doesn't
quite.
This commit is contained in:
Jason McBrayer 2018-11-15 14:45:40 -05:00
parent faace0fa07
commit 4676c49482
4 changed files with 10 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,22 +152,3 @@ function characterCount()
return $("#id_status").val().length + $("#id_spoiler_text").val().length; 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);
}
$('#page-load-indicator').hide();
});
return false;
}

86
brutaldon/templates/base.html
View File

@ -59,15 +59,7 @@
<nav class="navbar is-fixed-top is-primary" role="navigation" <nav class="navbar is-fixed-top is-primary" role="navigation"
aria-label="main navigation" id="main-nav-bar"> aria-label="main navigation" id="main-nav-bar">
<div class="navbar-brand"> <div class="navbar-brand">
<a class="navbar-item" href="{% url "home" %}" <a class="navbar-item" href="{% url "home" %}">
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">
{% if own_acct %} {% if own_acct %}
<img src="{{ own_acct.avatar_static }}" <img src="{{ own_acct.avatar_static }}"
class="image is-32x32 avatar" class="image is-32x32 avatar"
@ -83,36 +75,16 @@
<div class="navbar-menu is-active" id="navMenu"> <div class="navbar-menu is-active" id="navMenu">
<!-- navbar start, navbar end --> <!-- navbar start, navbar end -->
<div class="navbar-start"> <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 class="fa fa-home"></span>
<span>&nbsp; Home</span> <span>&nbsp; Home</span>
</a> </a>
<a class="navbar-item" href="{% url "note" %}" <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> <span class="fa fa-bell-o"></span>
{% if preferences.notifications and not preferences.theme.is_brutalist %} {% if preferences.notifications and not preferences.theme.is_brutalist %}
<span ic-src="{% url 'notes_count' %}" <span ic-src="{% url 'notes_count' %}"
ic-poll="{{ preferences.poll_frequency }}s" ic-poll="{{ preferences.poll_frequency }}s"
ic-target="this" ic-target="this"
ic-push-url="false"
ic-on-beforeSend="false"
ic-on-success="false"
ic-indicator="false"
ic-select-from-response="#notes-count"> ic-select-from-response="#notes-count">
<span <span
{% if notifications and notifications != '0' %} {% if notifications and notifications != '0' %}
@ -125,10 +97,6 @@
<span ic-src="{% url 'notes_count' %}" <span ic-src="{% url 'notes_count' %}"
ic-poll="{{ preferences.poll_frequency }}s" ic-poll="{{ preferences.poll_frequency }}s"
ic-target="this" ic-target="this"
ic-on-beforeSend="false"
ic-on-success="false"
ic-push-url="false"
ic-indicator="false"
ic-select-from-response="#notes-count"> ic-select-from-response="#notes-count">
<span >&nbsp; Notifications ({{ notifications }})</span> <span >&nbsp; Notifications ({{ notifications }})</span>
</span> </span>
@ -136,27 +104,11 @@
<span >&nbsp; Notifications</span> <span >&nbsp; Notifications</span>
{% endif %} {% endif %}
</a> </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 class="fa fa-community"></span>
<span >&nbsp; Local</span> <span >&nbsp; Local</span>
</a> </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 class="fa fa-globe"></span>
<span >&nbsp;Federated</span> <span >&nbsp;Federated</span>
</a> </a>
@ -167,35 +119,17 @@
<span class="fa fa-edit"> </span> <span class="fa fa-edit"> </span>
<span >&nbsp; New Toot</span> <span >&nbsp; New Toot</span>
</a> </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 class="fa fa-search"> </span>
<span >&nbsp; Search</span> <span >&nbsp; Search</span>
</a> </a>
</div> </div>
<div class="navbar-end" > <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 class="fa fa-gear"></span>
<span >&nbsp;Settings</span> <span >&nbsp;Settings</span>
</a> </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 class="fa fa-power-off"></span>
<span >&nbsp;Log out</span> <span >&nbsp;Log out</span>
</a> </a>
@ -206,7 +140,7 @@
</nav> </nav>
{% endblock %} {% endblock %}
<section id="main" class="section" ic-history-elt="true"> <section id="main" class="section">
<div class="container"> <div class="container">
{% block content %} {% block content %}
<h1 class="title"> <h1 class="title">
@ -248,8 +182,6 @@
<script type="application/javascript"> <script type="application/javascript">
$(document).ready(function () { $(document).ready(function () {
menuPrepare(); menuPrepare();
$(document).on('handle.onpopstate.ic',
restorePlace);
}); });
{% if preferences.lightbox %} {% if preferences.lightbox %}

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

@ -172,15 +172,7 @@
{% endif %} {% endif %}
{{ toot.visibility }} {{ toot.visibility }}
&nbsp;&nbsp; &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-scroll-to-target="true"
ic-on-beforeSend="savePlace"
ic-on-success="afterPage('{{ own_acct.username }}', 'thread');"
ic-indicator="#page-load-indicator">
thread thread
</a> </a>
</div> </div>

1
brutaldon/views.py
View File

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