X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=f9f970324bac324d8d24952cae1d2bccbf01a79a;hp=7e18d3c5fcd63ae37b8f5550982c271f24cb9042;hb=deb4800cd1e9b52f1c650d8ef0a03bcabb74ebb3;hpb=9db171ee763fbf5ba6d7f5cebd565e14d55b4ce0

diff --git a/phpfspot.js b/phpfspot.js
index 7e18d3c..f9f9703 100644
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -18,9 +18,9 @@ function showImage(id, scrollup)
    }
 
    /* delete some global vars */
-   delete(origHeight);
-   delete(origWidth);
-   delete(photo_details_pos);
+   delete(origHeight); origHeight = undefined;
+   delete(origWidth); origWidth = undefined;
+   delete(photo_details_pos); photo_details_pos = undefined;
 }
 
 function moveToThumb(thumb_id)
@@ -29,19 +29,22 @@ function moveToThumb(thumb_id)
       return;
 
    if(thumbimg = document.getElementById('thumbimg' + thumb_id)) {
-      window.scrollTo(0, findPos(thumbimg)-100);
+      window.scrollTo(0, findPos(thumbimg,'top')-100);
    }
 
 } // moveToThumb()
 
-function findPos(obj) {
-   var curtop = 0;
+function findPos(obj, direction) {
+   var cur = 0;
    if (obj.offsetParent) {
       do {
-         curtop += obj.offsetTop;
+         if(direction == 'left')
+            cur += obj.offsetLeft;
+         if(direction == 'top')
+            cur += obj.offsetTop;
       } while (obj = obj.offsetParent);
    }
-   return [curtop];
+   return [cur];
 }
 
 function showCredits()
@@ -77,7 +80,7 @@ function Tags(mode, id)
       refreshPhotoIndex();
    }
    else {
-      window.alert(retr);
+      window.alert("Server message: "+ retr);
    }
 
 } // Tags()
@@ -177,7 +180,7 @@ function startSearch()
       showPhotoIndex();
    }
    else {
-      window.alert(retr);
+      window.alert("Server message: "+ retr);
    }
 
 } // startSearch()
@@ -269,10 +272,20 @@ function getPhotoToShow()
 
 function zoom(mod)
 {
+   var photo;
+
    if(mod == undefined)
       return;
 
-   if(photo = document.getElementById('photo')) {
+   /* internet explorer */
+   if(document.images['photo'].width)
+      photo = document.images['photo'];
+
+   /* all others */
+   if(photo == undefined && document.getElementById('photo').width)
+      photo = document.getElementById('photo');
+
+   if(photo != undefined) {
 
       if(origWidth == undefined)
          origWidth = photo.width;
@@ -286,7 +299,7 @@ function zoom(mod)
          photo.height = new_h;
 
          if(photo_details_pos == undefined) {
-            photo_details_pos = document.getElementById('photo_details').offsetLeft;
+            photo_details_pos = findPos(document.getElementById('photo_details'),'left');
          }
 
          if((photo.offsetLeft + new_w) >= photo_details_pos-20) {
@@ -307,6 +320,8 @@ function zoom(mod)
 
 function hidePhotoDetails(mode)
 {
+   var photo_details;
+
    if(photo_details = document.getElementById('photo_details')) {
       if(mode == 'true') {
          photo_details.style.visibility = 'hidden';
@@ -314,7 +329,7 @@ function hidePhotoDetails(mode)
       }
       else {
          photo_details.style.visibility = 'visible';
-         photo_details.style.display = 'inline';
+         photo_details.style.display = '';
       }
    }
 } // hidePhotoDetails()
@@ -412,23 +427,32 @@ function WSR_getElementsByClassName(oElm, strTagName, oClassNames){
 }
 
 
-function preloadPhotos(lbImg) {
+function preloadPhotos(image_url) {
 
-   var d=document;
-   if(d.images)
-      if(!d.photos)
-         d.photos=new Array();
-
-   var i, j=d.photos.length;
+   var i;
+   var timeout = 1000;
+   var waiting = 100;
+   var counting;
 
    lbImg=WSR_getElementsByClassName(document,"img","thumb");
    for(i=0;i<lbImg.length;i++){
-      d.photos[j]=new Image;
-      d.photos[j].src=lbImg[i].src;
-      j++;
+      lbImg[i].src=image_url[i];
+      // to not bomb the server with requests, give the page some time
+      // to load the images one by one. if a image exceeds the timeout,
+      // the next image will be loaded.
+      if(lbImg[i].complete != undefined && lbImg[i].complete != true) {
+         counting = 0;
+         while(lbImg[i].complete != true && counting < timeout) {
+            window.setTimeout("noop()", waiting);
+            counting+=waiting;
+         }
+      }
    }
 }
 
+/* a function that does nothing */
+function noop() {}
+
 function startSlideShow()
 {
    if(!sliding) {
@@ -534,7 +558,7 @@ function update_sort_order(obj)
       showPhotoIndex();
    }
    else {
-      window.alert(retr);
+      window.alert("Server message: "+ retr);
    }
 
 } // update_sort_order()