Skip to content

Commit

Permalink
better synchronize the javascripts with 8chan
Browse files Browse the repository at this point in the history
  • Loading branch information
czaks committed Oct 5, 2014
1 parent 1964279 commit 606b394
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 20 deletions.
24 changes: 24 additions & 0 deletions js/auto-reload.js
Expand Up @@ -17,6 +17,7 @@
*
*/


auto_reload_enabled = true; // for watch.js to interop

$(document).ready(function(){
Expand All @@ -35,6 +36,7 @@ $(document).ready(function(){
var settings = new script_settings('auto-reload');
var poll_interval_mindelay = settings.get('min_delay_bottom', 5000);
var poll_interval_maxdelay = settings.get('max_delay', 600000);
var poll_interval_errordelay = settings.get('error_delay', 30000);

// number of ms to wait before reloading
var poll_interval_delay = poll_interval_mindelay;
Expand Down Expand Up @@ -182,6 +184,28 @@ $(document).ready(function(){
else
$('#update_secs').text("No new posts found");
}
},
error: function(xhr, status_text, error_text) {
if (status_text == "error") {
if (error_text == "Not Found") {
$('#update_secs').text("Thread deleted or pruned");
$('#auto_update_status').prop('checked', false);
$('#auto_update_status').prop('disabled', true); // disable updates if thread is deleted
return;
} else {
$('#update_secs').text("Error: "+error_text);
}
} else if (status_text) {
$('#update_secs').text("Error: "+status_text);
} else {
$('#update_secs').text("Unknown error");
}

// Keep trying to update
if ($('#auto_update_status').is(':checked')) {
poll_interval_delay = poll_interval_errordelay;
auto_update(poll_interval_delay);
}
}
});

Expand Down
52 changes: 33 additions & 19 deletions js/id_colors.js
@@ -1,25 +1,39 @@
if (active_page == 'thread' || active_page == 'index') {
$(document).ready(function(){
$.hash = function(str) {
var i, j, msg = 0;

for (i = 0, j = str.length; i < j; ++i) {
msg = ((msg << 5) - msg) + str.charCodeAt(i);
if (window.Options && Options.get_tab('general')) {
selector = '#color-ids>input';
event = 'change';
Options.extend_tab("general", "<label id='color-ids'><input type='checkbox' /> "+_('Color IDs')+"</label>");
}

else {
selector = '#color-ids';
event = 'click';
$('hr:first').before('<div id="color-ids" style="text-align:right"><a class="unimportant" href="javascript:void(0)">'+_('Color IDs')+'</a></div>')
}

$(selector).on(event, function() {
if (localStorage.color_ids === 'true') {
localStorage.color_ids = 'false';
} else {
localStorage.color_ids = 'true';
}

return msg;
};

function stringToRGB(str){
var rgb, hash;

rgb = [];
hash = $.hash(str);

rgb[0] = (hash >> 24) & 0xFF;
rgb[1] = (hash >> 16) & 0xFF;
rgb[2] = (hash >> 8) & 0xFF;

});

if (!localStorage.color_ids || localStorage.color_ids === 'false') {
return;
} else {
$('#color-ids>input').attr('checked','checked');
}

function IDToRGB(id_str){
var id = id_str.match(/.{1,2}/g);
var rgb = new Array();

for (i = 0; i < id.length; i++) {
rgb[i] = parseInt(id[i], 16);
}

return rgb;
}

Expand Down
8 changes: 7 additions & 1 deletion js/id_highlighter.js
Expand Up @@ -23,7 +23,7 @@ if (active_page == 'thread' || active_page == 'index') {
return toRet;
}

$(".poster_id").click(function(){
var id_highlighter = function(){
var id = $(this).text();

if($.inArray(id, idshighlighted) !== -1){
Expand All @@ -39,6 +39,12 @@ if (active_page == 'thread' || active_page == 'index') {
$(this).addClass("highlighted");
});
}
}

$(".poster_id").on('click', id_highlighter);

$(document).on('new_post', function(e, post) {
$(post).find('.poster_id').on('click', id_highlighter);
});
});
}

0 comments on commit 606b394

Please sign in to comment.