1
0
mirror of synced 2024-12-01 17:16:02 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2013-01-08 09:13:43 -08:00
parent c3f41dcef0
commit d96d0dceff
2 changed files with 4 additions and 1 deletions

View File

@ -1375,6 +1375,9 @@ $("#tags").select2({
<code>String escapeMarkup(String markup)</code> <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> <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> </td></tr>
<tr><td>selectOnBlur</td><td>boolean</td><td>
<p>Set to <code>true</code> if you want Select2 to select the currently highlighted option when it is blurred</p>
</td></tr>
</table> </table>
<div class="row"> <div class="row">

@ -1 +1 @@
Subproject commit 8e9a23184792d40ffad65bc831f41b8b2db5a792 Subproject commit b4f6462bb29d485bc158580b62e84812267165c5