CLEANUP: moves javascript from header into game.js

should make html output smaller, since game.js can be cached

diff --git a/include/game.js b/include/game.js
index 862d8b60ba74f4558112b127892111e8d657fa67..bf9327241e79c91c6e47388837c59299d6638ba4 100644 (file)
--- a/include/game.js
+++ b/include/game.js
@@ -4,15 +4,10 @@ var current=0;
 
 /* do the higlighting */
 function hl(num) {
 
 /* do the higlighting */
 function hl(num) {

-    if(document.getElementById){
-       var i;
-       for(i=0;i<14;i++){
-           if(document.getElementById("trick"+i))
-               document.getElementById("trick"+i).style.display = 'none';
-       }
-       document.getElementById("trick"+num).style.display = 'block';
-       current=num;
-    }
+    var i;
+    for(i=0;i<14;i++){ $("#trick"+i).hide(); }
+    $("#trick"+num).css('display', 'block');
+    current=num;

 }
 
 /* highlight the last trick, useful when a page is called the first time*/
 }
 
 /* highlight the last trick, useful when a page is called the first time*/


@@ -43,3 +38,40 @@ function hl_prev()
     if(document.getElementById("trick"+(current-1)))
        hl(current-1);
 }
     if(document.getElementById("trick"+(current-1)))
        hl(current-1);
 }

+
+$(document).ready(
+    function()
+    {
+       $("#ScoreTable").tablesorter({ widgets: ['zebra']});
+
+       $(".gameshidesession").click( function () {
+           $(this).parenthesis().children(".gamessession").hide(300);
+           $(this).parent().children(".gamesshowsession").show();
+           $(this).hide();
+       });
+
+       $(".gamesshowsession").click( function () {
+           $(this).parenthesis().children(".gamessession").show(300);
+           $(this).parent().children(".gameshidesession").show();
+           $(this).hide();
+       });
+
+       $(".gameshowall").click( function () {
+           $(".gamessession").show(300);
+           $(".gamesshowsession").hide();
+           $(".gameshidesession").show();
+       });
+       $(".gamehideall").click( function () {
+           $(".gamessession").hide(300);
+           $(".gamesshowsession").show();
+           $(".gameshidesession").hide();
+       });
+
+       $("ul.loginregister").click(function () {
+           $(".dologin").slideToggle();
+           $(".doregister").slideToggle();
+       });
+
+       $(".message div div").parent().click ( function() { $(this).hide(); });
+
+    });

diff --git a/include/output.php b/include/output.php
index e91451c677f95ace37e475dc74c32b4c84dfea2b..c6d78e32bfa53931d0c5fdb3bbc7437b841cd897 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -386,41 +386,6 @@ function output_header()
      <script type="text/javascript" src="include/jquery.tools.min.js"></script>
      <script type="text/javascript" src="include/game.js"> </script>
      <script type="text/javascript">
      <script type="text/javascript" src="include/jquery.tools.min.js"></script>
      <script type="text/javascript" src="include/game.js"> </script>
      <script type="text/javascript">

-        $(document).ready(function()
-          {
-              $("#ScoreTable").tablesorter({ widgets: ['zebra']});
-
-             $(".gameshidesession").click( function () {
-                 $(this).parent().children(".gamessession").hide(300);
-                 $(this).parent().children(".gamesshowsession").show();
-                 $(this).hide();
-               });
-
-             $(".gamesshowsession").click( function () {
-                 $(this).parent().children(".gamessession").show(300);
-                 $(this).parent().children(".gameshidesession").show();
-                 $(this).hide();
-               });
-
-             $(".gameshowall").click( function () {
-                 $(".gamessession").show(300);
-                 $(".gamesshowsession").hide();
-                 $(".gameshidesession").show();
-               });
-             $(".gamehideall").click( function () {
-                 $(".gamessession").hide(300);
-                 $(".gamesshowsession").show();
-                 $(".gameshidesession").hide();
-               });
-
-             $("ul.loginregister").click(function () {
-                 $(".dologin").slideToggle();
-                 $(".doregister").slideToggle();
-               });
-
-             $(".message div div").parent().click ( function() { $(this).hide(); });
-
-           });

      </script>
   </head>
 <body onload="high_last();">
      </script>
   </head>
 <body onload="high_last();">