1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-22 13:30:02 +01:00

Javascript ammendments, dio_ on Windows.

#475 - Fixed both issues.

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
parent 0f4591aa90
commit c240c96ea8
6 changed files with 120 additions and 79 deletions

View File

@ -641,6 +641,31 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
}
}
if (!function_exists("dio_truncate")) {
if (!$fp = fopen($path, $simple ? 'w' : 'c'))
error('Unable to open file for writing: ' . $path);
// File locking
if (!$simple && !flock($fp, LOCK_EX))
error('Unable to lock file: ' . $path);
// Truncate file
if (!$simple && !ftruncate($fp, 0))
error('Unable to truncate file: ' . $path);
// Write data
if (($bytes = fwrite($fp, $data)) === false)
error('Unable to write to file: ' . $path);
// Unlock
if (!$simple)
flock($fp, LOCK_UN);
// Close
if (!fclose($fp))
error('Unable to close file: ' . $path);
}
else {
if (!$fp = dio_open($path, O_WRONLY | O_CREAT, 0644))
error('Unable to open file for writing: ' . $path);
@ -662,6 +687,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
// Close
dio_close($fp);
}
/**
* Create gzipped file.

View File

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

View File

@ -45,13 +45,13 @@ var load_next_page = function() {
if (!href) return;
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) {
var doc = $(data);
loading_ind.remove();
boardheader.insertBefore('form[name="postcontrols"]>.delete:first');
boardheader.insertBefore('#post-moderation-fields');
var i = 0;
@ -62,13 +62,15 @@ var load_next_page = function() {
if ($('div#thread_' + checkout).length == 0) {
// Delay DOM insertion to lessen the lag.
setTimeout(function() {
$($this).insertBefore('form[name="postcontrols"]>.delete:first');
$($this).insertBefore('#post-moderation-fields');
$(document).trigger('new_post', $this);
$($this).hide().slideDown();
}, 500*i);
i++;
}
});
setTimeout(function() {
loading = false;
scrolltest();
@ -76,7 +78,6 @@ var load_next_page = function() {
next_page.addClass('selected');
});
};
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') {
$(document).ready(function () {
$(document).on('menu_ready', function () {
'use strict';
// returns blacklist object from storage
function getList() {
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
*/
function initPostMenu(pageData) {
var Menu = window.Menu;
var submenu;
Menu.add_item('filter-menu-hide', _('Hide post'));
Menu.add_item('filter-menu-unhide', _('Unhide post'));
@ -836,4 +837,8 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata
}
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/post-menu.js';
*/
onready(function () {
$(document).ready(function () {
var List = function (menuId, text) {
this.id = menuId;
@ -133,6 +133,8 @@ Menu.get_submenu = function (id) {
return mainMenu.get_submenu(id);
};
window.Menu = Menu;
/* * * * * * * *
Initialize
@ -205,5 +207,5 @@ $(document).on('new_post', function (e, post) {
addButton(post);
});
window.Menu = Menu;
$(document).trigger('menu_ready');
});

View File

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