X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=57345ab1705caf7eb064fbce9b4aa4fa5974d08b;hp=ae202a0c004f69d0e7eb792c19f62711d787b571;hb=8996f568db6eb662e9bc54ffe2f6766d11429ee7;hpb=d97a057346bebb98be293d903a86987273cbee3e diff --git a/phpfspot.js b/phpfspot.js index ae202a0..57345ab 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 @@ -265,27 +265,33 @@ function setCheckedValue(condition, value) { */ function startSearch() { - from_year = document.getElementById('fromyear').value; - from_month = document.getElementById('frommonth').value; - from_day = document.getElementById('fromday').value; - from = from_year +"-"+ from_month +"-"+ from_day; - to_year = document.getElementById('toyear').value; - to_month = document.getElementById('tomonth').value; - to_day = document.getElementById('today').value; - to = to_year +"-"+ to_month +"-"+ to_day; - + if(document.getElementById('date_from').value != undefined) { + date_from = document.getElementById('date_from').value; + } + if(document.getElementById('date_to').value != undefined) { + date_to = document.getElementById('date_to').value; + } + 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) { - objTemp['from'] = from; - objTemp['to'] = to; + if(document.getElementsByName('consider_date')[0] != undefined && + document.getElementsByName('consider_date')[0].checked == true) { + objTemp['date_from'] = date_from; + objTemp['date_to'] = date_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); @@ -314,12 +320,8 @@ function datesearch() 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; + document.getElementById('date_from').disabled = mode; + document.getElementById('date_to').disabled = mode; } // datesearch() @@ -329,8 +331,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 +349,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 +412,7 @@ function init_phpfspot(srv_webpath) } if(whattodo == 'show_photo') { if(photo = getPhotoToShow()) { - showImage(photo); + showPhoto(photo); refreshSelectedTags(); } } @@ -640,17 +654,19 @@ function preloadPhotos(image_url) { var waiting = 100; var counting; - lbImg=WSR_getElementsByClassName(document,"img","thumb"); - for(i=0;i