From: Art Cancro Date: Thu, 19 Apr 2007 19:58:38 +0000 (+0000) Subject: h0h0h0./webserver -p80 Prototype has an 'evalscripts' parameter X-Git-Tag: v7.86~3428 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=8a03e5f7fa0957347c0d5e220f3393e7675f0596 h0h0h0./webserver -p80 Prototype has an 'evalscripts' parameter to Ajax.Updater(). Now we can trigger auto-populate of the inner div after the middle div populates, in the address book popup. --- diff --git a/webcit/addressbook_popup.c b/webcit/addressbook_popup.c index 00360defe..d96122481 100644 --- a/webcit/addressbook_popup.c +++ b/webcit/addressbook_popup.c @@ -23,8 +23,8 @@ void display_address_book_middle_div(void) { wprintf(""); wprintf("
" - ""); serv_puts("LKRA"); serv_getln(buf, sizeof buf); if (buf[0] == '1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) { @@ -45,6 +45,10 @@ void display_address_book_middle_div(void) { ">"); wprintf(""); + wprintf("\n"); + end_ajax_response(); } @@ -53,10 +57,13 @@ void display_address_book_middle_div(void) { /** * \brief Address book popup results */ -void display_address_book_inner_div(void) { +void display_address_book_inner_div() { int i; static int foo; + char *which_addr_book; + which_addr_book = bstr("which_addr_book"); + lprintf(9, "FIXME get addresses in <%s>\n", which_addr_book); begin_ajax_response(); wprintf("
" diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index a894692cd..605fed06f 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -671,20 +671,21 @@ function PopOpenAddressBook() { { method: 'get', parameters: CtdlRandomString(), - onComplete: PopulateAddressBookInnerDiv() + evalScripts: true } ); Nifty('div#address_book_popup_container_div','big transparent'); } -function PopulateAddressBookInnerDiv() { +function PopulateAddressBookInnerDiv(which_addr_book) { $('address_book_inner_div').innerHTML = "

  Loading....

"; + p = 'which_addr_book=' + which_addr_book + '&r=' + CtdlRandomString(); new Ajax.Updater( 'address_book_inner_div', 'display_address_book_inner_div', { method: 'get', - parameters: CtdlRandomString() + parameters: p } ); }