kashire/lainchan
4
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

main.js: a bit more sane code

Browse Source
This commit is contained in:
czaks 2016-05-05 14:38:24 +02:00
parent 6991ca270e
commit 02c3c28a16
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/thread-watcher.js
View File

@ -79,8 +79,8 @@ watchlist.add = function(sel) {
} else {
postCount = $(sel).parents('.op').siblings('.post').length+1;
}
//Grab the reply link.
var threadLink = $(sel).siblings('a:contains("['+_('Reply')+']")').attr('href');
//Grab the reply link.;
var threadLink = $(sel).siblings('a:not(.watchThread)').last().attr('href');
//Figure out the thread name. If anon, use the thread id.
if ($(sel).parent().find('.subject').length) {
threadName = $(sel).parent().find('.subject').text().substring(0,20);

6
templates/index.html
View File

@ -4,10 +4,12 @@
<meta charset="utf-8">
<script type="text/javascript">
var
{% if not no_post_form %}
var active_page = "index";
active_page = "index"
, board_name = "{{ board.uri }}";
{% else %}
var active_page = "ukko";
active_page = "ukko";
{% endif %}
</script>

11
templates/main.js
View File

@ -115,7 +115,10 @@ var styles = {
{% for stylesheet in stylesheets %}{% raw %}'{% endraw %}{{ stylesheet.name|addslashes }}{% raw %}' : '{% endraw %}{{ stylesheet.uri|addslashes }}{% raw %}',
{% endraw %}{% endfor %}{% raw %}
};
var board_name = false;
if (typeof board_name === 'undefined') {
var board_name = false;
}
function changeStyle(styleName, link) {
{% endraw %}
@ -159,13 +162,7 @@ function changeStyle(styleName, link) {
{% endraw %}
{% if config.stylesheets_board %}
{# This is such an unacceptable mess. There needs to be an easier way. #}
{# Needs fix for slugify #}
var matches = document.URL.match(/\/(\w+)\/($|{{ config.dir.res|replace({'/': '\\/'}) }}{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }}|{{ config.file_index|replace({'.': '\\.'}) }}|{{ config.file_page|replace({'%d': '\\d+', '.': '\\.'}) }})/);
{% raw %}
if (matches) {
board_name = matches[1];
}
if (!localStorage.board_stylesheets) {
localStorage.board_stylesheets = '{}';

2
templates/page.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<script type="text/javascript">
active_page = "page";
var active_page = "page";
</script>
{% include 'header.html' %}
<title>{{ title }}</title>

3
templates/themes/catalog/catalog.html
View File

@ -4,7 +4,8 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<script type='text/javascript'>
active_page = "catalog";
var active_page = "catalog"
, board_name = "{{ board }}";
</script>
{% include 'header.html' %}
<title>{{ settings.title }}</title>

4
templates/thread.html
View File

@ -4,7 +4,9 @@
<meta charset="utf-8">
<script type="text/javascript">
var active_page = "thread";
var active_page = "thread"
, board_name = "{{ board.uri }}"
, thread_id = "{{ thread.id }}";
</script>
{% include 'header.html' %}