Fix tons of JSLint issues.

diff --git a/files/pr0n-fullscreen.js b/files/pr0n-fullscreen.js
index 001efc1c5e60d9f995546c3e7eccf907ad94a320..df64c0743222d50d30037c362e2b6f47fa70a1f1 100644 (file)
--- a/files/pr0n-fullscreen.js
+++ b/files/pr0n-fullscreen.js
@@ -58,9 +58,11 @@ function reduce_to_fixed_width(size)
                [ 120, 96 ],
                [ 80, 64 ]
        ];
+       var i;
        for (i = 0; i < fixed_sizes.length; ++i) {
-               if (size[0] >= fixed_sizes[i][0] && size[1] >= fixed_sizes[i][1])
+               if (size[0] >= fixed_sizes[i][0] && size[1] >= fixed_sizes[i][1]) {
                        return fixed_sizes[i];
+               }
        }
        return [ 80, 64 ];
 }
@@ -69,7 +71,7 @@ function display_image(width, height, evt, filename, element_id)
 {
        var url = "http://" + global_vhost + "/" + evt + "/" + width + "x" + height + "/" + global_infobox + filename;
        var img = document.getElementById(element_id);
-       if (img != null) {
+       if (img !== null) {
                img.src = "data:";
                img.parentNode.removeChild(img);
        }
@@ -92,7 +94,7 @@ function prepare_preload(img, width, height, evt, filename)
 {
        // cancel any pending preload
        var preload = document.getElementById("preload");
-       if (preload != null) {
+       if (preload !== null) {
                preload.src = "data:";
                preload.parentNode.removeChild(preload);
        }
@@ -106,28 +108,14 @@ function prepare_preload(img, width, height, evt, filename)
        }       
 }
 
-function relayout()
+function can_go_next()
 {
-       var size = find_width();
-       var adjusted_size = reduce_to_fixed_width(size);
-
-       var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
-       if (can_go_next()) {
-               prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1]);
-       }
-       
-       // center the image on-screen
-       var main = document.getElementById("main");
-       main.style.position = "absolute";
-       main.style.left = (size[0] - adjusted_size[0]) / 2 + "px";
-       main.style.top = (size[1] - adjusted_size[1]) / 2 + "px"; 
-       main.style.width = adjusted_size[0] + "px";
-       main.style.height = adjusted_size[1] + "px";
-       main.style.lineHeight = adjusted_size[1] + "px"; 
+       return (global_image_num < global_image_list.length - 1);
+}
 
-       set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
-       set_opacity("next", can_go_next() ? 0.7 : 0.1);
-       set_opacity("close", 0.7);
+function can_go_previous()
+{
+       return (global_image_num > 0);
 }
 
 function set_opacity(id, amount)
@@ -164,15 +152,35 @@ function set_opacity(id, amount)
        }
 }
 
-function can_go_previous()
+function relayout()
 {
-       return (global_image_num > 0);
+       var size = find_width();
+       var adjusted_size = reduce_to_fixed_width(size);
+
+       var img = display_image(adjusted_size[0], adjusted_size[1], global_image_list[global_image_num][0], global_image_list[global_image_num][1], "image");
+       if (can_go_next()) {
+               prepare_preload(img, adjusted_size[0], adjusted_size[1], global_image_list[global_image_num + 1][0], global_image_list[global_image_num + 1]);
+       }
+       
+       // center the image on-screen
+       var main = document.getElementById("main");
+       main.style.position = "absolute";
+       main.style.left = (size[0] - adjusted_size[0]) / 2 + "px";
+       main.style.top = (size[1] - adjusted_size[1]) / 2 + "px"; 
+       main.style.width = adjusted_size[0] + "px";
+       main.style.height = adjusted_size[1] + "px";
+       main.style.lineHeight = adjusted_size[1] + "px"; 
+
+       set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
+       set_opacity("next", can_go_next() ? 0.7 : 0.1);
+       set_opacity("close", 0.7);
 }
 
 function go_previous()
 {
-       if (!can_go_previous())
+       if (!can_go_previous()) {
                return;
+       }
 
        --global_image_num;
 
@@ -188,15 +196,11 @@ function go_previous()
        set_opacity("next", can_go_next() ? 0.7 : 0.1);
 }
 
-function can_go_next()
-{
-       return (global_image_num < global_image_list.length - 1);
-}
-
 function go_next()
 {
-       if (!can_go_next())
+       if (!can_go_next()) {
                return;
+       }
 
        ++global_image_num;
 
@@ -212,6 +216,66 @@ function go_next()
        set_opacity("previous", can_go_previous() ? 0.7 : 0.1);
 }
 
+function do_close()
+{
+       window.location = global_return_url;
+}
+
+function draw_text(msg)
+{
+       // remove any text we might have left
+       var text = document.getElementById("text");
+       if (text !== null) {
+               text.parentNode.removeChild(text);
+       }
+
+       text = document.createElement("p");
+       text.id = "text";
+       text.style.position = "absolute";
+       text.style.color = "white";
+       text.style.lineHeight = "24px";
+       text.style.font = "24px verdana, arial, sans-serif";
+       text.innerHTML = msg;
+
+       var main = document.getElementById("main");
+       main.appendChild(text);
+
+       text.style.left = (main.clientWidth - text.clientWidth) / 2 + "px";
+       text.style.top = (main.clientHeight - text.clientHeight) / 2 + "px";
+}
+
+function fade_text(opacity)
+{
+       set_opacity("text", opacity);
+       if (opacity > 0.0) {
+               opacity -= 0.03;
+               if (opacity < 0.0) {
+                       opacity = 0.0;
+               }
+               setTimeout("fade_text(" + opacity + ")", 30);
+       } else {
+               var text = document.getElementById("text");
+               if (text !== null) {
+                       text.parentNode.removeChild(text);
+               }
+       }
+}
+
+function select_image(evt, filename)
+{
+       if (!req) {
+               return;
+       }
+
+       draw_text("Selecting " + filename + "...");
+       
+       req.open("POST", "http://" + global_vhost + "/select", false);
+       req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+       req.send("mode=single&event=" + evt + "&filename=" + filename);
+
+       setTimeout("fade_text(0.99)", 30);
+}
+
 function key_down(which)
 {
        if (which == 39) {   // right
@@ -246,64 +310,6 @@ function key_up(which) {
        }
 }
 
-function select_image(evt, filename)
-{
-       if (!req)
-               return;
-
-       draw_text("Selecting " + filename + "...");
-       
-       req.open("POST", "http://" + global_vhost + "/select", false);
-       req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-       req.send("mode=single&event=" + evt + "&filename=" + filename);
-
-       setTimeout("fade_text(0.99)", 30);
-}
-
-function fade_text(opacity)
-{
-       set_opacity("text", opacity);
-       if (opacity > 0.0) {
-               opacity -= 0.03;
-               if (opacity < 0.0)
-                       opacity = 0.0;
-               setTimeout("fade_text(" + opacity + ")", 30);
-       } else {
-               var text = document.getElementById("text");
-               if (text != null) {
-                       text.parentNode.removeChild(text);
-               }
-       }
-}
-
-function do_close()
-{
-       window.location = global_return_url;
-}
-
-function draw_text(msg)
-{
-       // remove any text we might have left
-       var text = document.getElementById("text");
-       if (text != null) {
-               text.parentNode.removeChild(text);
-       }
-
-       text = document.createElement("p");
-       text.id = "text";
-       text.style.position = "absolute";
-       text.style.color = "white";
-       text.style.lineHeight = "24px";
-       text.style.font = "24px verdana, arial, sans-serif";
-       text.innerHTML = msg;
-
-       var main = document.getElementById("main");
-       main.appendChild(text);
-
-       text.style.left = (main.clientWidth - text.clientWidth) / 2 + "px";
-       text.style.top = (main.clientHeight - text.clientHeight) / 2 + "px";
-}
-
 // enable the horrible horrible IE PNG hack
 function ie_png_hack()
 {

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 39c5da43f97000fef1a96b401ebd3239efece9e5..72fd824943d93ca9b460ba0a2cb756463b6fe4da 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -173,8 +173,16 @@ sub handler {
        if ($settings{'fullscreen'}) {
                $r->content_type("text/html; charset=utf-8");
                Sesse::pr0n::Templates::print_template($r, "fullscreen-header", { title => "$name [$event]" });
+
+               my @files = ();
                while (my $ref = $q->fetchrow_hashref()) {
-                       $r->print("        [ \"" . $ref->{'event'} . "\", \"" . $ref->{'filename'} . "\" ],\n");
+                       push @files, [ $ref->{'event'}, $ref->{'filename'} ];
+               }
+               
+               for my $i (0..$#files) {
+                       $r->print("        [ \"" . $files[$i]->[0] . "\", \"" . $files[$i]->[1] . "\" ]");
+                       $r->print(",") unless ($i == $#files);
+                       $r->print("\n");
                }
 
                my %settings_no_fullscreen = %settings;

diff --git a/templates/default/fullscreen-footer b/templates/default/fullscreen-footer
index 1f67de3db38a70fe4f9bc214e68fdd9f9c336761..353f3d2028d3215a2d074f8a3cbc548a6314d4e5 100644 (file)
--- a/templates/default/fullscreen-footer
+++ b/templates/default/fullscreen-footer
@@ -5,8 +5,6 @@ var global_return_url = "%RETURNURL%";
 var global_image_num = %START%;
 var global_select = %SEL%;
 // end generated
-
-//-->
     </script>
     <script type="text/JavaScript" src="/pr0n-fullscreen.js"></script>
   </head>

diff --git a/templates/default/fullscreen-header b/templates/default/fullscreen-header
index faf73dd0dbc26a6f5c87abd37a69dec3ad0f8855..179753f6b9bca0ba2ff3deb9904eaebacba7c99d 100644 (file)
--- a/templates/default/fullscreen-header
+++ b/templates/default/fullscreen-header
@@ -6,6 +6,5 @@
     <title>%TITLE%</title>
     <link rel="stylesheet" href="/pr0n-fullscreen.css" type="text/css" />
     <script type="text/JavaScript">
-<!--
 // the following code snippet is generated by the server
 var global_image_list = [