issue41, remove any trace of the javascript bubble

[phpfspot.git] / phpfspot.js

diff --git a/phpfspot.js b/phpfspot.js
index ce66cf6a35a924ec5f5a5e979575f5c06fb791ac..be15455a107c61e0aadce75ca7b21e0cdd33fd6c 100644 (file)
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -66,11 +66,6 @@ function showPhotoIndex(begin_with)
       HTML_AJAX.replace(document.getElementById("content"), encodeURI('rpc.php?action=show_photo_index&begin_with=' + begin_with));
 }
 
-function showBubbleDetails(object, id, direction)
-{
-   HTML_AJAX.replace(object, encodeURI('rpc.php?action=showbubbledetails&id=' + id + '&direction=" + direction'));
-}
-
 // if photo index is currently shown, refresh it
 function refreshPhotoIndex()
 {
@@ -131,8 +126,14 @@ function init_phpfspot()
 {
    refreshAvailableTags();
 
-   if(refreshSelectedTags()) {
-      showPhotoIndex();
+   if(photo = getPhotoToShow()) {
+      showImage(photo)
+      refreshSelectedTags();
+   }
+   else {
+      if(refreshSelectedTags()) {
+         showPhotoIndex();
+      }
    }
 }
 
@@ -146,5 +147,19 @@ function setBackGrdColor(item, color)
       item.style.backgroundColor='#93A8CA';
 }
 
+function getPhotoToShow()
+{
+   // update selected tags
+   var photo_to_show = HTML_AJAX.grab(encodeURI('rpc.php?action=get_photo_to_show'));
+
+   // if no image needs to be shown, return false from here
+   if(photo_to_show == "")
+      return false;
+   
+   return photo_to_show;
+}
+
+
+
 var startup = 1;