Changeset 11212


Ignore:
Timestamp:
06/02/11 17:40:49 (8 years ago)
Author:
patdenice
Message:

merge r11211 from branch 2.2 to trunk
bug:2321
Tag names must be escaped in tag input.

Location:
trunk/admin/themes/default/template
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/themes/default/template/batch_manager_global.tpl

    r11039 r11212  
    1313jQuery(document).ready(function() {ldelim} 
    1414  jQuery("#tags").tokenInput( 
    15     [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
     15    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
    1616    {ldelim} 
    1717      hintText: '{'Type in a search term'|@translate}', 
  • trunk/admin/themes/default/template/batch_manager_unit.tpl

    r11039 r11212  
    1717jQuery(document).ready(function() {ldelim} 
    1818  jQuery(tag_boxes_selector).tokenInput( 
    19     [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
     19    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
    2020    {ldelim} 
    2121      hintText: '{'Type in a search term'|@translate}', 
  • trunk/admin/themes/default/template/picture_modify.tpl

    r11039 r11212  
    77jQuery(document).ready(function() {ldelim} 
    88  jQuery("#tags").tokenInput( 
    9     [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
     9    [{foreach from=$tags item=tag name=tags}{ldelim}"name":"{$tag.name|@escape:'javascript'}","id":"{$tag.id}"{rdelim}{if !$smarty.foreach.tags.last},{/if}{/foreach}], 
    1010    {ldelim} 
    1111      hintText: '{'Type in a search term'|@translate}', 
Note: See TracChangeset for help on using the changeset viewer.