X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=555e8ff47155eb9f49dd0aa971ac46a2fbb55633;hp=ae202a0c004f69d0e7eb792c19f62711d787b571;hb=f999055210a94d26b9ae58950ff4d45eee86e869;hpb=b5ff85f75a27397c1ab4164fdefa9d734dc0e39d diff --git a/phpfspot.js b/phpfspot.js index ae202a0..555e8ff 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -21,14 +21,14 @@ ***************************************************************************/ /** - * display image + * show photo * * this function will be called by client and fetches * the single-photo view via AJAX from the server. * Furthermore it will scrollup the browser to the top * position so the image become visibile immediatley. */ -function showImage(id, scrollup) +function showPhoto(id, scrollup) { /* is phpfspot skeleton really displayed? */ if(!document.getElementById('content')) @@ -54,7 +54,7 @@ function showImage(id, scrollup) delete(origWidth); origWidth = undefined; delete(photo_details_pos); photo_details_pos = undefined; -} // showImage() +} // showPhoto() /** * scroll browser to the last shown photo @@ -277,16 +277,24 @@ function startSearch() var objTemp = new Object(); objTemp['action'] = 'search'; - if(document.getElementsByName('searchfor_tag')[0].value != "") { + if(document.getElementsByName('searchfor_tag')[0] != undefined && + document.getElementsByName('searchfor_tag')[0].value != "") { objTemp['for_tag'] = document.getElementsByName('searchfor_tag')[0].value; } - if(document.getElementsByName('searchfor_name')[0].value != "") { + if(document.getElementsByName('searchfor_name')[0] != undefined && + document.getElementsByName('searchfor_name')[0].value != "") { objTemp['for_name'] = document.getElementsByName('searchfor_name')[0].value; } - if(document.getElementsByName('consider_date')[0].checked == true) { + if(document.getElementsByName('consider_date')[0] != undefined && + document.getElementsByName('consider_date')[0].checked == true) { objTemp['from'] = from; objTemp['to'] = to; } + if(document.getElementsByName('consider_rate')[0] != undefined && + document.getElementsByName('consider_rate')[0].checked == true) { + objTemp['rate_from'] = rate_search['from']; + objTemp['rate_to'] = rate_search['to']; + } var retr = HTML_AJAX.post(web_path + '/rpc.php', objTemp); if(retr == "ok") { @@ -329,8 +337,13 @@ function datesearch() * called for photo-index export. will return the * selected mode via AJAX from the server. */ -function setViewMode(mode) +function setViewMode(srv_webpath, mode) { + if(srv_webpath != undefined) + web_path = srv_webpath; + else + web_path = ''; + var exprt = document.getElementById('output'); exprt.innerHTML = "Loading..."; exprt.innerHTML = HTML_AJAX.grab(encodeURI(web_path + '/rpc.php?action=get_export&mode=' + mode)); @@ -342,13 +355,20 @@ function setViewMode(mode) */ function clearSearch() { - document.getElementsByName('searchfor_tag')[0].value = ''; - document.getElementsByName('searchfor_name')[0].value = ''; + if(document.getElementsByName('searchfor_tag')[0] != undefined) + document.getElementsByName('searchfor_tag')[0].value = ''; + if(document.getElementsByName('searchfor_name')[0] != undefined) + document.getElementsByName('searchfor_name')[0].value = ''; - if(document.getElementsByName('consider_date')[0].checked == true) { + if(document.getElementsByName('consider_date')[0] != undefined && + document.getElementsByName('consider_date')[0].checked == true) { document.getElementsByName('consider_date')[0].checked = false; datesearch(); - } + } + if(document.getElementsByName('consider_rate')[0] != undefined && + document.getElementsByName('consider_rate')[0].checked == true) { + document.getElementsByName('consider_rate')[0].checked = false; + } } // clearSearch() @@ -398,7 +418,7 @@ function init_phpfspot(srv_webpath) } if(whattodo == 'show_photo') { if(photo = getPhotoToShow()) { - showImage(photo); + showPhoto(photo); refreshSelectedTags(); } } @@ -640,17 +660,19 @@ function preloadPhotos(image_url) { var waiting = 100; var counting; - lbImg=WSR_getElementsByClassName(document,"img","thumb"); - for(i=0;i