From: Steinar H. Gunderson Date: Fri, 25 Jul 2008 11:15:09 +0000 (+0200) Subject: Various ugliness to track hash changes from pastes etc. better. X-Git-Url: https://git.sesse.net/?p=pr0n;a=commitdiff_plain;h=b0fbbdc03df1966524472c026371235db2d45b48 Various ugliness to track hash changes from pastes etc. better. --- diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js index 5434a3e..3cc6055 100644 --- a/files/pr0n-fullscreen.js +++ b/files/pr0n-fullscreen.js @@ -40,9 +40,9 @@ function find_width() return [null,null]; } -function parse_image_num(url, default_value) { +function parse_image_num(default_value) { var num = parseInt(window.location.hash.substr(1)); - if (num > 1 && num <= global_image_list.length) { // and then num != NaN + if (num >= 1 && num <= global_image_list.length) { // and then num != NaN return (num - 1); } else { return default_value; @@ -394,6 +394,8 @@ function key_down(which) } } else if (which == 27) { // escape set_opacity("close", 0.99); + } else { + check_for_hash_change(); } } @@ -413,6 +415,8 @@ function key_up(which) { do_close(); } else if (which == 32 && global_select) { // space select_image(global_image_list[global_image_num][0], global_image_list[global_image_num][1]); + } else { + check_for_hash_change(); } } @@ -432,3 +436,13 @@ function ie_png_hack() close.outerHTML = ""; } } + +function check_for_hash_change() { + var num = parseInt(window.location.hash.substr(1)); + if (num >= 1 && num <= global_image_list.length) { // and then num != NaN + if (--num != global_image_num) { + global_image_num = num; + relayout(); + } + } +} diff --git a/templates/default/fullscreen-footer b/templates/default/fullscreen-footer index f443085..22c5705 100644 --- a/templates/default/fullscreen-footer +++ b/templates/default/fullscreen-footer @@ -2,12 +2,12 @@ var global_vhost = "%VHOST%"; var global_infobox = "%INFOBOX%"; var global_return_url = "%RETURNURL%"; -var global_image_num = parse_image_num(window.location, %START%); +var global_image_num = parse_image_num(%START%); var global_select = %SEL%; // end generated - +