issue99, search for filename and photo description

[phpfspot.git] / phpfspot.js

diff --git a/phpfspot.js b/phpfspot.js
index 1b1f05d5ca4e1ec8f6f39ad54f56453991dd8198..d11f52477649edc2840e058cba4c603baf8f1172 100644 (file)
--- a/phpfspot.js
+++ b/phpfspot.js
@@ -58,7 +58,7 @@ function showPhotoIndex(begin_with)
 // if photo index is currently shown, refresh it
 function refreshPhotoIndex()
 {
-   if(document.getElementById("matrix") != undefined || startup == 1) {
+   if(document.getElementById("index") != undefined || startup == 1) {
       showPhotoIndex();
       startup = 0;
    }
@@ -92,7 +92,8 @@ function setCheckedValue(condition, value) {
 
 function startSearch()
 {
-   var searchfor = document.getElementsByName('searchfor')[0].value
+   var searchfor_tag = document.getElementsByName('searchfor_tag')[0].value;
+   var searchfor_name = document.getElementsByName('searchfor_name')[0].value;
 
    from_year = document.getElementById('fromyear').value;
    from_month = document.getElementById('frommonth').value;
@@ -105,8 +106,12 @@ function startSearch()
 
    var request = 'rpc.php?action=search';
 
-   if(searchfor != "") {
-      request = request + '&for=' + searchfor;
+   if(searchfor_tag != "") {
+      request = request + '&for_tag=' + searchfor_tag;
+   }
+   
+   if(searchfor_name != "") {
+      request = request + '&for_name=' + searchfor_name;
    }
    
    if(document.getElementsByName('consider_date')[0].checked == true) {
@@ -147,7 +152,8 @@ function setViewMode(mode)
 
 function clearSearch()
 {
-   document.getElementsByName('searchfor')[0].value = '';
+   document.getElementsByName('searchfor_tag')[0].value = '';
+   document.getElementsByName('searchfor_name')[0].value = '';
 
    if(document.getElementsByName('consider_date')[0].checked == true) {
       document.getElementsByName('consider_date')[0].checked = false;
@@ -442,6 +448,14 @@ function keyDown(e) {
          }
          return;
       }
+      if(key == 73 && evt.altKey && evt.ctrlKey) /* ctrl+alt+i */ {
+         showPhotoIndex();
+         return;
+      }
+      if(key == 82 && evt.altKey && evt.ctrlKey) /* ctrl+alt+r */ {
+         resetAll();
+         return;
+      }
    }
 }