1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-12 01:50:48 +01:00

Javascript ammendments, dio_ on Windows.

Signed-off-by: 8n-tech <8n-tech@users.noreply.github.com>
This commit is contained in:
8n-tech 2015-04-21 01:39:44 +10:00 committed by czaks
parent 6b04b3c671
commit e64b01b690
5 changed files with 72 additions and 57 deletions

View File

@ -9,9 +9,10 @@
*/ */
if (active_page == 'thread' || active_page == 'index') { if (active_page == 'thread' || active_page == 'index') {
$(document).ready(function(){ $(document).on('menu_ready', function(){
if ($('#delete-fields #password').length) { if ($('#delete-fields #password').length) {
var Menu = window.Menu;
Menu.add_item("delete_post_menu", _("Delete post")); Menu.add_item("delete_post_menu", _("Delete post"));
Menu.add_item("delete_file_menu", _("Delete file")); Menu.add_item("delete_file_menu", _("Delete file"));
Menu.onclick(function(e, $buf) { Menu.onclick(function(e, $buf) {
@ -57,4 +58,9 @@ $(document).on('new_post', function(){
}); });
$('input.delete').hide(); $('input.delete').hide();
$('#post-moderation-fields').hide(); $('#post-moderation-fields').hide();
})} });
if (typeof window.Menu !== "undefined") {
$(document).trigger('menu_ready');
}
}

View File

@ -21,7 +21,7 @@ var activate = function() {
if (document.location.hash != '#all') return false; if (document.location.hash != '#all') return false;
$(window).on("scroll", function() { $(window).on("scroll", function() {
scrolltest(); scrolltest();
}); });
scrolltest(); scrolltest();
@ -30,53 +30,54 @@ var activate = function() {
var scrolltest = function() { var scrolltest = function() {
if ($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading) { if ($(window).scrollTop() + $(window).height() + 1000 > $(document).height() && !loading) {
load_next_page(); load_next_page();
} }
}; };
var load_next_page = function() { var load_next_page = function() {
if (loading) return; if (loading) return;
loading = true; loading = true;
var this_page = $(".pages a.selected:last"); var this_page = $(".pages a.selected:last");
var next_page = this_page.next(); var next_page = this_page.next();
var href = next_page.prop("href"); var href = next_page.prop("href");
if (!href) return; if (!href) return;
var boardheader = $('<h2>'+_('Page')+' '+next_page.html()+'</h2>'); var boardheader = $('<h2>'+_('Page')+' '+next_page.html()+'</h2>');
var loading_ind = $('<h2>'+_('Loading...')+'</h2>').insertBefore('form[name="postcontrols"]>.delete:first'); var loading_ind = $('<h2>'+_('Loading...')+'</h2>').insertBefore('#post-moderation-fields');
$.get(href, function(data) { $.get(href, function(data) {
var doc = $(data); var doc = $(data);
loading_ind.remove(); loading_ind.remove();
boardheader.insertBefore('form[name="postcontrols"]>.delete:first'); boardheader.insertBefore('#post-moderation-fields');
var i = 0; var i = 0;
doc.find('div[id*="thread_"]').each(function() { doc.find('div[id*="thread_"]').each(function() {
var checkout = $(this).attr('id').replace('thread_', ''); var checkout = $(this).attr('id').replace('thread_', '');
var $this = this; var $this = this;
if ($('div#thread_' + checkout).length == 0) { if ($('div#thread_' + checkout).length == 0) {
// Delay DOM insertion to lessen the lag. // Delay DOM insertion to lessen the lag.
setTimeout(function() { setTimeout(function() {
$($this).insertBefore('form[name="postcontrols"]>.delete:first'); $($this).insertBefore('#post-moderation-fields');
$(document).trigger('new_post', $this); $(document).trigger('new_post', $this);
$($this).hide().slideDown(); $($this).hide().slideDown();
}, 500*i); }, 500*i);
i++;
}
});
setTimeout(function() {
loading = false;
scrolltest();
}, 500*(i+1));
next_page.addClass('selected'); i++;
}); }
});
setTimeout(function() {
loading = false;
scrolltest();
}, 500*(i+1));
next_page.addClass('selected');
});
}; };
var button = $("<a href='#all'>"+_("All")+" </a>").prependTo(".pages"); var button = $("<a href='#all'>"+_("All")+" </a>").prependTo(".pages");

View File

@ -1,6 +1,7 @@
if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog') { if (active_page === 'thread' || active_page === 'index' || active_page === 'catalog') {
$(document).ready(function () { $(document).on('menu_ready', function () {
'use strict'; 'use strict';
// returns blacklist object from storage // returns blacklist object from storage
function getList() { function getList() {
return JSON.parse(localStorage.postFilter); return JSON.parse(localStorage.postFilter);
@ -200,7 +201,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
* create filter menu when the button is clicked * create filter menu when the button is clicked
*/ */
function initPostMenu(pageData) { function initPostMenu(pageData) {
var Menu = window.Menu;
var submenu; var submenu;
Menu.add_item('filter-menu-hide', _('Hide post')); Menu.add_item('filter-menu-hide', _('Hide post'));
Menu.add_item('filter-menu-unhide', _('Unhide post')); Menu.add_item('filter-menu-unhide', _('Unhide post'));
@ -836,4 +837,8 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
} }
init(); init();
}); });
if (typeof window.Menu !== "undefined") {
$(document).trigger('menu_ready');
}
} }

View File

@ -26,7 +26,7 @@
* $config['additional_javascript'][] = 'js/jquery.min.js'; * $config['additional_javascript'][] = 'js/jquery.min.js';
* $config['additional_javascript'][] = 'js/post-menu.js'; * $config['additional_javascript'][] = 'js/post-menu.js';
*/ */
onready(function () { $(document).ready(function () {
var List = function (menuId, text) { var List = function (menuId, text) {
this.id = menuId; this.id = menuId;
@ -133,6 +133,8 @@ Menu.get_submenu = function (id) {
return mainMenu.get_submenu(id); return mainMenu.get_submenu(id);
}; };
window.Menu = Menu;
/* * * * * * * * /* * * * * * * *
Initialize Initialize
@ -205,5 +207,5 @@ $(document).on('new_post', function (e, post) {
addButton(post); addButton(post);
}); });
window.Menu = Menu; $(document).trigger('menu_ready');
}); });

View File

@ -416,12 +416,13 @@ fieldset label {
} }
div.pages { div.pages {
color: #89A; color: #89A;
background: #D6DAF0; background: #D6DAF0;
display: inline; display: inline-block;
padding: 8px; padding: 8px;
border-right: 1px solid #B7C5D9; margin: 8px 0 4px 0;
border-bottom: 1px solid #B7C5D9; border-right: 1px solid #B7C5D9;
border-bottom: 1px solid #B7C5D9;
} }
div.pages.top { div.pages.top {