harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

Fix AJAX bug, wasn't triggering if called immediately from QR

Browse Source
This commit is contained in:
Fredrick Brennan 2015-03-12 12:19:30 +08:00
parent 7e9eca4fb4
commit 3ac306b6ea
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/instance-config.php
View File

@ -115,7 +115,6 @@
$config['additional_javascript'][] = 'js/expand.js'; $config['additional_javascript'][] = 'js/expand.js';
$config['additional_javascript'][] = 'js/titlebar-notifications.js'; $config['additional_javascript'][] = 'js/titlebar-notifications.js';
$config['additional_javascript'][] = 'js/auto-reload.js'; $config['additional_javascript'][] = 'js/auto-reload.js';
$config['additional_javascript'][] = 'js/quick-reply.js';
$config['additional_javascript'][] = 'js/options/user-css.js'; $config['additional_javascript'][] = 'js/options/user-css.js';
$config['additional_javascript'][] = 'js/options/user-js.js'; $config['additional_javascript'][] = 'js/options/user-js.js';
$config['additional_javascript'][] = 'js/forced-anon.js'; $config['additional_javascript'][] = 'js/forced-anon.js';
@ -129,6 +128,7 @@
$config['additional_javascript'][] = 'js/download-original.js'; $config['additional_javascript'][] = 'js/download-original.js';
$config['additional_javascript'][] = 'js/thread-watcher.js'; $config['additional_javascript'][] = 'js/thread-watcher.js';
$config['additional_javascript'][] = 'js/ajax.js'; $config['additional_javascript'][] = 'js/ajax.js';
$config['additional_javascript'][] = 'js/quick-reply.js';
$config['additional_javascript'][] = 'js/show-own-posts.js'; $config['additional_javascript'][] = 'js/show-own-posts.js';
$config['additional_javascript'][] = 'js/youtube.js'; $config['additional_javascript'][] = 'js/youtube.js';
$config['additional_javascript'][] = 'js/comment-toolbar.js'; $config['additional_javascript'][] = 'js/comment-toolbar.js';
@ -213,7 +213,7 @@ $config['show_sages'] = false;
$config['katex'] = false; $config['katex'] = false;
$config['enable_antibot'] = false; $config['enable_antibot'] = false;
$config['spam']['unicode'] = false; $config['spam']['unicode'] = false;
$config['twig_cache'] = true; $config['twig_cache'] = false;
// 8chan specific mod pages // 8chan specific mod pages
require '8chan-mod-pages.php'; require '8chan-mod-pages.php';

17
js/ajax.js
View File

@ -12,13 +12,10 @@
* *
*/ */
$(window).ready(function() { +function() {
var settings = new script_settings('ajax'); var settings = new script_settings('ajax');
var do_not_ajax = false; var do_not_ajax = false;
// Enable submit button if disabled (cache problem)
$('input[type="submit"]').removeAttr('disabled');
var setup_form = function($form) { var setup_form = function($form) {
$form.submit(function() { $form.submit(function() {
if (do_not_ajax) if (do_not_ajax)
@ -46,7 +43,7 @@ $(window).ready(function() {
}; };
$.ajax({ $.ajax({
url: '/post.php', url: configRoot+'post.php',
type: 'POST', type: 'POST',
xhr: function() { xhr: function() {
var xhr = $.ajaxSettings.xhr(); var xhr = $.ajaxSettings.xhr();
@ -137,9 +134,13 @@ $(window).ready(function() {
return false; return false;
}); });
}; };
setup_form($('div#post-form-outer'));
$(window).on('quick-reply', function() { $(window).on('quick-reply', function() {
$('div#quick-reply').off('submit'); $('div#quick-reply form').off('submit');
setup_form($('div#quick-reply')); setup_form($('div#quick-reply'));
}); });
}); onready(function(){
// Enable submit button if disabled (cache problem)
$('input[type="submit"]').removeAttr('disabled');
setup_form($('div#post-form-outer'));
});
}();