Item10302:

* now defaulting to jquery-1.6.3 * fixed autocomplete backend in example git-svn-id: http://svn.foswiki.org/trunk@12512 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Sep 12, 2011 · fcb791e · fcb791e
1 parent 23c1dc8
commit fcb791e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/JQueryPlugin/data/System/JQueryUIAutocomplete.txt b/JQueryPlugin/data/System/JQueryUIAutocomplete.txt
@@ -236,20 +236,21 @@ var countryList = [
 This implementation extracts the list of countries from %SYSTEMWEB%.CountryList:
 
 <verbatim class="tml">
-%STARTSECTION{"data"}%%SEARCH{
- "^\| .*%URLPARAM{"term"}%.* \| *$"
+%STARTSECTION{"data"}%<noautolink>
+%SEARCH{
+ "^\| [^\*].*%URLPARAM{"term"}%.* \| *$"
  web="%SYSTEMWEB%"
  topic="CountryList"
  type="regex"
  multiple="on"
  nonoise="on"
  casesensitive="off"
  header="["
- format="\"$pattern(.*?\| ([^\|]*).*)\""
+ format="\"$pattern(.*?\| ([^\|]*) \|.*)\""
  separator=", "
  footer="]"
 }%
-%ENDSECTION{"data"}%
+</noautolink>%ENDSECTION{"data"}%
 </verbatim>
 
 See http://jqueryui.com/demos/autocomplete/ for more demos.
diff --git a/JQueryPlugin/data/System/JQueryValidate.txt b/JQueryPlugin/data/System/JQueryValidate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1311336492" format="1.1" reprev="3" version="4"}%
+%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1315837703" format="1.1" reprev="3" version="6"}%
 %META:TOPICPARENT{name="JQueryPlugin"}%
 ---+ %TOPIC%
 %JQPLUGINS{"validate"
@@ -36,4 +36,5 @@ Very powerful client-side form validation framework
   </div>
 </div>
 </form>
+
 %IF{"'%URLPARAM{"dateofbirth"}%'!=''" then="<div class='foswikiSuccessMessage'>Thanks.</div>"}%
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
@@ -27,7 +27,7 @@ $Foswiki::cfg{JQueryPlugin}{NoConflict} = 0;
 $Foswiki::cfg{JQueryPlugin}{DefaultPlugins} = '';
 
 # **SELECT jquery-1.4.3, jquery-1.4.4, jquery-1.5, jquery-1.5.1, jquery-1.5.2, jquery-1.6.1, jquery-1.6.2, jquery-1.6.3**
-$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-1.4.3';
+$Foswiki::cfg{JQueryPlugin}{JQueryVersion} = 'jquery-1.6.3';
 
 # **SELECT ,base, flickr, foswiki, lightness, redmond, smoothness**
 $Foswiki::cfg{JQueryPlugin}{JQueryTheme} = 'foswiki';

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.autocomplete.init.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/ui/jquery.ui.autocomplete.init.uncompressed.js
@@ -37,16 +37,25 @@ jQuery(function($) {
 
         // get result from backend
         $.log("AUTOCOMPLETE: requesting '"+term+"' from "+opts._source);
-        lastXhr = $.getJSON(opts._source, request, function(data, status, xhr) {
-          cache[cacheKey] = data;
-          $.log("AUTOCOMPLETE: caching "+term);
-
-          // throw away response if there already was a newer one
-          if (xhr === lastXhr) {
-            $.log("AUTOCOMPLETE: got data for '"+term+"' from backend");
-            response(data);
-          } else {
-            $.log("AUTOCOMPLETE: throwing away results for '"+term+"'");
+        lastXhr = $.ajax({
+          url: opts._source, 
+          dataType: 'json',
+          data: request, 
+          success: function(data, status, xhr) {
+            cache[cacheKey] = data;
+            $.log("AUTOCOMPLETE: caching "+term);
+
+            // throw away response if there already was a newer one
+            if (xhr === lastXhr) {
+              $.log("AUTOCOMPLETE: got data for '"+term+"' from backend");
+              response(data);
+            } else {
+              $.log("AUTOCOMPLETE: throwing away results for '"+term+"'");
+            }
+          },
+          error: function(xhr, status, error) {
+            alert("Error: "+status);
+            response();
           }
         });
       };