issue50, further code changes to be able to combine tag- and date-search

[phpfspot.git] / phpfspot.js

diff --git a/phpfspot.js b/phpfspot.js
index 068a96f76c0c5427789d538b8c5ff389a42259fa..5aac78800011fd5c8008dec6e295fda099531361 100644 (file)
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -90,16 +90,10 @@ function setCheckedValue(condition, value) {
    }
 }
 
-function startTagSearch(searchfor)
+function startSearch()
 {
-   HTML_AJAX.grab(encodeURI('rpc.php?action=tag_search&for=' + searchfor));
-   refreshAvailableTags();
-   refreshSelectedTags();
-   showPhotoIndex();
-}
+   var searchfor = document.getElementsByName('searchfor')[0].value
 
-function startDateSearch()
-{
    from_year = document.getElementById('fromyear').value;
    from_month = document.getElementById('frommonth').value;
    from_day = document.getElementById('fromday').value;
@@ -109,12 +103,41 @@ function startDateSearch()
    to_day = document.getElementById('today').value;
    to = to_year +"-"+ to_month +"-"+ to_day;
 
-   HTML_AJAX.grab(encodeURI('rpc.php?action=date_search&from='+ from +'&to='+ to));
+   var request = 'rpc.php?action=search';
 
-   refreshPhotoIndex();
+   if(searchfor != "") {
+      request = request + '&for=' + searchfor;
+   }
+   
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      request = request + '&from='+ from +'&to='+ to;
+   }
+
+   HTML_AJAX.grab(encodeURI(request));
+
+   refreshAvailableTags();
+   refreshSelectedTags();
+   showPhotoIndex();
    
 }
 
+function datesearch()
+{
+   var mode = true;
+
+   if(document.getElementsByName('consider_date')[0].checked == true) {
+      mode = false;
+   }
+      
+   document.getElementById('fromyear').disabled = mode;
+   document.getElementById('frommonth').disabled = mode;
+   document.getElementById('fromday').disabled = mode;
+   document.getElementById('toyear').disabled = mode;
+   document.getElementById('tomonth').disabled = mode;
+   document.getElementById('today').disabled = mode;
+ 
+}
+
 function setViewMode(mode)
 {
    var exprt = document.getElementById('output');
@@ -226,6 +249,55 @@ function resetAll()
    refreshPhotoIndex();
 }
 
+function WSR_getElementsByClassName(oElm, strTagName, oClassNames){
+   var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName);
+   var arrReturnElements = new Array();
+   var arrRegExpClassNames = new Array();
+   if(typeof oClassNames == "object"){
+      for(var i=0; i<oClassNames.length; i++){
+         arrRegExpClassNames.push(new RegExp("(^|\s)" + oClassNames[i].replace(/-/g, "\-") + "(\s|$)"));
+      }
+   }
+   else{
+      arrRegExpClassNames.push(new RegExp("(^|\s)" + oClassNames.replace(/-/g, "\-") + "(\s|$)"));
+   }
+   var oElement;
+   var bMatchesAll;
+   for(var j=0; j<arrElements.length; j++){
+      oElement = arrElements[j];
+      bMatchesAll = true;
+      for(var k=0; k<arrRegExpClassNames.length; k++){
+         if(!arrRegExpClassNames[k].test(oElement.className)){
+            bMatchesAll = false;
+            break;
+         }
+      }
+      if(bMatchesAll){
+         arrReturnElements.push(oElement);
+      }
+   }
+   return (arrReturnElements)
+}
+
+
+function preloadPhotos(lbImg) {
+
+   var d=document;
+   if(d.images)
+      if(!d.photos)
+         d.photos=new Array();
+
+   var i, j=d.photos.length;
+
+   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++;
+   }
+}
+
 var startup = 1;
 var calendar_shown = 0;
 var calendar_mode = '';
+