1
0
mirror of synced 2025-02-09 16:49:24 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2012-08-27 09:52:19 -07:00
parent 8a0add0a45
commit a9a0db5aa4
2 changed files with 5 additions and 1 deletions

View File

@ -1272,6 +1272,10 @@ $("#tags").select2({
<tr><td>dropdownCssClass</td><td>function/string</td><td>
Css class that will be added to select2's dropdown container
</td></tr>
<tr><td>escapeMarkup</td><td>function</td><td>
<code>String escapeMarkup(String markup)</code>
<p>Function used to post-process markup returned from formatter functions. By default this function escapes html entities to prevent javascript injection.</p>
</td></tr>
</table>
<div class="row">

@ -1 +1 @@
Subproject commit 69567cd2cb96ae0d8832308903c9c35ff6b263a8
Subproject commit 7baa3b9e93690b7dacad8fbb22f71b8a3940e04d