script.js
changeset 90 49897f71f067
parent 89 728dc42f2eb3
     1.1 --- a/script.js	Fri Jan 06 18:28:31 2012 +0100
     1.2 +++ b/script.js	Sat Jan 07 01:33:27 2012 +0100
     1.3 @@ -142,26 +142,29 @@
     1.4      var canvas = document.getElementById("logo");
     1.5      var context = canvas.getContext("2d");    
     1.6      var image = context.getImageData(0, 0, menu_width, menu_height);
     1.7 -    if (p) {
     1.8 -        var page = p["args"][0]; 
     1.9 -        var min_x = p["min_x"];
    1.10 -        var max_x = p["max_x"];
    1.11 -        var min_y = p["min_y"];
    1.12 -        var max_y = p["max_y"];
    1.13 -        console.log(page);
    1.14 -        last_colours[0] = colour_area(image, min_x + 10, max_x - 10, 0, 60, orange);
    1.15 -        last_colours[1] = colour_area(image, min_x + 10, max_x - 10, 60, max_y - 10, white);
    1.16 -        console.log(last_colours);
    1.17 -    }
    1.18      if (last_highlight && last_colours && last_colours[0] && last_colours[1]) {        
    1.19          page = last_highlight["args"][0]; 
    1.20          min_x = last_highlight["min_x"];
    1.21          max_x = last_highlight["max_x"];
    1.22          min_y = last_highlight["min_y"];
    1.23 -        max_y = last_highlight["max_y"]; 
    1.24 -        colour_area(image, min_x + 10, max_x - 10, 0, 60, last_colours[0]);
    1.25 -        colour_area(image, min_x + 10, max_x - 10, 60, max_y - 10, last_colours[1]);
    1.26 +        max_y = last_highlight["max_y"];
    1.27 +        colour_area(image, min_x + 10, max_x - 10, 0, 60, 
    1.28 +                    last_colours[0]);
    1.29 +        colour_area(image, min_x + 10, max_x - 10, 60, max_y - 10, 
    1.30 +                    last_colours[1]);
    1.31      }
    1.32 +    if (p) {    
    1.33 +        var page = p["args"][0]; 
    1.34 +        var min_x = p["min_x"];
    1.35 +        var max_x = p["max_x"];
    1.36 +        var min_y = p["min_y"];
    1.37 +        var max_y = p["max_y"];       
    1.38 +        last_colours[0] = colour_area(image, min_x + 10, max_x - 10, 0, 60, 
    1.39 +                                      orange);
    1.40 +        last_colours[1] = colour_area(image, min_x + 10, max_x - 10, 60, max_y - 10, 
    1.41 +                                      white);        
    1.42 +    }
    1.43 +    
    1.44      context.putImageData(image, 0, 0);
    1.45      last_highlight = p;
    1.46  }