Changeset 2966

Show
Ignore:
Timestamp:
08/06/10 00:55:08
Author:
johnsa
Message:

user client: move to newer jquery UI autocomplete for adding attendees in scheduling grid

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/head.xsl

    r2964 r2966  
    4343    <!-- note: the non-breaking spaces in the script bodies below are to avoid 
    4444         losing the script closing tags (which avoids browser problems) --> 
     45    <!--  
    4546    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    4647    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    4748    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    48     <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     49    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/>  
     50    --> 
     51     
     52    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.4.2.min.js">&#160;</script> 
     53    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.8.2.custom.min.js">&#160;</script> 
     54    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/bw-theme-3p7/jquery-ui-1.8.2.custom.css"/> 
     55    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/bw-theme-3p7/bedeworkJquery.css"/>  
     56     
     57     
    4958    <!-- load bedework personal client javascript libraries --> 
    5059    <script type="text/javascript" src="{$resourcesRoot}/javascript/bedework.js">&#160;</script> 
    …… 
    161170      <script type="text/javascript" src="{$resourcesRoot}/javascript/bedeworkScheduling.js">&#160;</script> 
    162171      <link rel="stylesheet" href="{$resourcesRoot}/css/bwScheduling.css"/> 
    163        
     172      <!--  
    164173      <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/bw-jquery.autocomplete.js">&#160;</script> 
    165174      <script type="text/javascript" src="/bedework-common/javascript/jquery/autocomplete/jquery.bgiframe.min.js">&#160;</script> 
    166175      <script type="text/javascript" src="{$resourcesRoot}/javascript/bedeworkAttendees.js">&#160;</script> 
    167176      <link rel="stylesheet" type="text/css" href="/bedework-common/javascript/jquery/autocomplete/jquery.autocomplete.css" /> 
    168        
     177      --> 
    169178      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkAccess.js">&#160;</script> 
    170179      <link rel="stylesheet" href="/bedework-common/default/default/bedeworkAccess.css"/> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

    r2964 r2966  
    10551055      ); 
    10561056       
    1057       // auto-completion for add attendee input field  
     1057      // auto-completion for add attendee input field - DEPRECATED  
    10581058      // carddavUrl supplied in bedework.js 
    1059        var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookUsers.js" 
    1060        //var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookLocations.js" 
    1061       $("#bwScheduleTable #bwAddAttendee").autocomplete(carddavUrl, bwAutoCompleteOptions); 
     1059      // var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookUsers.js" 
     1060      // var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookLocations.js" 
     1061      //$("#bwScheduleTable #bwAddAttendee").autocomplete(carddavUrl, bwAutoCompleteOptions); 
     1062       
     1063      // below is the newer jquery UI autocomplete 
     1064      $("#bwScheduleTable #bwAddAttendee").autocomplete({ 
     1065        minLength: 1, 
     1066        // set the data source, call it, and format the results: 
     1067        source: function(req, include) { 
     1068          // build the address book url; the path to the addressbook is determined by the 
     1069          // radio button choices in the "add attendee" widget 
     1070          addrBookUrl = carddavUrl + "?format=json&addrbook=" + $("#bwCardDavBookPath").val(); 
     1071           
     1072          // call the server and format the results into an array "items" 
     1073          $.getJSON(addrBookUrl, req, function(data) { 
     1074            var acResults = data.microformats.vcard; 
     1075            var items = []; 
     1076            $.each(acResults, function(i,entry) { 
     1077              var curlabel = entry.fn.value + ", " + entry.email[0].value; 
     1078              var cururi = ""; 
     1079              if (entry.caladruri != undefined && entry.caladruri.value != undefined) { 
     1080                cururi = entry.caladruri.value; 
     1081              } 
     1082              if (cururi == "" && entry.email != undefined && entry.email[0] != undefined && entry.email[0].value != undefined) { 
     1083                var curEmail = entry.email[0].value; 
     1084                if (curEmail != "") { 
     1085                  cururi = "mailto:" + curEmail; 
     1086                } 
     1087              } 
     1088              if (cururi != "") { 
     1089                var curItem = {label: curlabel, value: cururi}; 
     1090                items.push(curItem); 
     1091              } 
     1092            }); 
     1093             
     1094            // pass items to the callback function for display in the autocomplete pulldown 
     1095            include(items); 
     1096          }); 
     1097        } 
     1098      }); 
    10621099       
    10631100      // capture the enter key when entering an attendee;