Item11511: Don't claim content-type html if not

The JSON data needs to be returned as other than text/html or the SafeWikiPlugin chokes trying to validate it as html. git-svn-id: http://svn.foswiki.org/branches/Release01x01@13944 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 11, 2012 · 2fe9209 · 2fe9209
1 parent 7b65665
commit 2fe9209
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/JQueryPlugin/data/System/JQueryAjaxHelper.txt b/JQueryPlugin/data/System/JQueryAjaxHelper.txt
@@ -52,7 +52,7 @@ loads the =topic= section of this topic, which expands to the topic list.
      =excludetopic= parameter in VarSEARCH
 <verbatim class="tml">
 %STARTSECTION{"topicselector"}%<!-- topicselector  -->
-<input type="text" class="foswikiInputField" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=topic;skin=text;baseweb=%BASEWEB%;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
+<input type="text" class="foswikiInputField" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=topic;skin=text;contenttype=application/json;baseweb=%BASEWEB%;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
 <!-- //topicselector -->%ENDSECTION{"topicselector"}%
 </verbatim>
 
@@ -101,7 +101,7 @@ Foswiki:Extensions.FlexWebListPlugin. "}% </div>
    * =INPUT_VALUE=: preselected value
 <verbatim class="tml">
 %STARTSECTION{"webselector"}%<!-- webselector  -->
-<input type="text" class="foswikiInputField" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=web;skin=text;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
+<input type="text" class="foswikiInputField" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=web;skin=text;contenttype=application/json;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
 <!-- //webselector -->%ENDSECTION{"webselector"}%
 </verbatim>
 
@@ -162,7 +162,7 @@ jQuery(function($){
     var $this = $(this), 
         opts = $.extend({}, $this.metadata());
     $this.autocomplete({
-      source: "%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=topic;skin=text;baseweb="+opts.baseweb+";format="+opts.format,
+      source: "%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=topic;skin=text;contenttype=application/json;baseweb="+opts.baseweb+";format="+opts.format,
       select: function(event, ui) {
         window.location.href="%SCRIPTURLPATH{"view"}%/"+(opts.global?'':opts.baseweb+'/')+ui.item.value;
       }
@@ -204,7 +204,7 @@ Uses the =[[#Topic_selector][topic]]= server section, defined above.
    * =INPUT_VALUE=: preselected user
 <verbatim class="tml">
 %STARTSECTION{"userselector"}%<!-- userselector -->
-<input type="text" class="foswikiInputField jqUserSelector" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=user;skin=text" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
+<input type="text" class="foswikiInputField jqUserSelector" name="%INPUT_NAME%" id="%INPUT_NAME%" autocomplete="%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=user;skin=text;contenttype=application/json" size="60" value="%IF{"defined INPUT_VALUE" then="%INPUT_VALUE%"}%" />
 %ADDTOZONE{"script"
   tag="userselector::js"
   section="userselector::js"
@@ -287,7 +287,7 @@ or later).
 <script type=\"text/javascript\">
 jQuery(function($){
   $(\"#%ID%\").click(function() {
-     $.get(\"%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=query;source=%SOURCE%;query=%QUERY%;skin=text\",
+     $.get(\"%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=query;source=%SOURCE%;query=%QUERY%;skin=text;contenttype=application/json\",
          function(data) {
              // This is the function that will be executed when the
              // data is fetched

diff --git a/core/data/Main/GroupViewTemplate.txt b/core/data/Main/GroupViewTemplate.txt
@@ -233,7 +233,7 @@ link="<img src='%ICONURLPATH{"wrench"}%' alt='%MAKETEXT{"Upgrade group topic..."
 <div class='foswikiFormSteps'>
   <div class='foswikiFormStep'>
      <h3>%MAKETEXT{"Add users or groups to this group"}%</h3>%JQREQUIRE{"textboxlist"}%
-     <input type='text' name='username' value='' size='30' class='foswikiInputField jqTextboxList' autocomplete='%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=user;skin=text;baseweb=%BASEWEB%;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%' />
+     <input type='text' name='username' value='' size='30' class='foswikiInputField jqTextboxList' autocomplete='%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=user;skin=text;contenttype=application/json;baseweb=%BASEWEB%;%IF{"defined EXCLUDE" then="exclude=%EXCLUDE%"}%' />
   </div>
   <div class='foswikiFormStep foswikiLast'>
      %BUTTON{"%MAKETEXT{"Add members"}%" icon="add" type="submit"}%