X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.js;h=2d7e780c4cf7b4a63400d2dceb7c03a0a75191ae;hp=fcc5766a2506f9b304bfb86c8d8d588bc4d9f06e;hb=4b243ea6dcf859c392ec52aad66a580c99fe2bb0;hpb=dc815d80d15437e0e6a56bfcfbff81b241cdd727 diff --git a/phpfspot.js b/phpfspot.js index fcc5766..2d7e780 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -21,7 +21,8 @@ function Tags(mode, id) HTML_AJAX.grab(encodeURI('rpc.php?action=deltag&id=' + id)); } else if(mode == "reset") { - HTML_AJAX.grab(encodeURI('rpc.php?action=resettags')); + HTML_AJAX.grab(encodeURI('rpc.php?action=reset')); + clearSearch(); } else if(mode == "condition") { setCheckedValue(id, id.value); @@ -38,6 +39,7 @@ function refreshAvailableTags() { // update available tags var avail_tags = document.getElementById('available_tags'); + avail_tags.innerHTML = "Loading..."; avail_tags.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=show_available_tags')); } @@ -45,6 +47,7 @@ function refreshSelectedTags() { // update selected tags var selected_tags = document.getElementById("selected_tags"); + selected_tags.innerHTML = "Loading..."; selected_tags.innerHTML = HTML_AJAX.grab(encodeURI('rpc.php?action=show_selected_tags')); } @@ -64,8 +67,9 @@ function showBubbleDetails(object, id, direction) // if photo index is currently shown, refresh it function refreshPhotoIndex() { - if(document.getElementById("matrix") != undefined) { + if(document.getElementById("matrix") != undefined || startup == 1) { showPhotoIndex(); + startup = 0; } } @@ -95,9 +99,11 @@ function setCheckedValue(condition, value) { } } -function startSearch(searchfor) +function startTagSearch(searchfor) { - HTML_AJAX.grab(encodeURI('rpc.php?action=search&for=' + searchfor)); + HTML_AJAX.grab(encodeURI('rpc.php?action=tag_search&for=' + searchfor)); + refreshAvailableTags(); + refreshSelectedTags(); showPhotoIndex(); } @@ -106,3 +112,5 @@ function clearSearch() { document.getElementsByName('searchfor')[0].value = ''; } + +var startup = 1;