From 3d24fbdf2959d0001e1c3d37426a194b1b5d1a4e Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 16 Jul 2012 00:31:37 +0300
Subject: [PATCH] catch up to master

---
 select2-latest.html | 29 +++++++++++++++++++----------
 select2-master      |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/select2-latest.html b/select2-latest.html
index 9e365113..c42c0bd7 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -925,39 +925,48 @@ $("#e18,#e18_2").select2();
             </td></tr>
             <tr><td>formatSelection</td><td>function</td><td>
                 Function used to render the current selection.
-                <pre>formatSelection(object)</pre>
+                <pre>formatSelection(object, container)</pre>
                 <table class="table table-bordered table-striped">
                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
                     <tr><td>object</td><td>object</td><td>The selected result object returned from the <code>query</code> function</td></tr>
-                    <tr><td>&lt;returns&gt;</td><td>string</td><td>Html string, a DOM element, or a jQuery object that renders the selection</td></tr>
+                    <tr><td>container</td><td>jQuery object</td><td>jQuery wrapper of the node to which the selection should be appended</td></tr>
+                    <tr><td>&lt;returns&gt;</td><td>string (optional)</td><td>Html string, a DOM element, or a jQuery object that renders the selection</td></tr>
                 </table>
-                The default implementation expects the object to have a <code>text</code> property that is returned.
+                <p>The default implementation expects the object to have a <code>text</code> property that is returned.</p>
+                <p>The implementation may choose to append elements directly to the provided <code>container</code> object, or return a single value and have it automatically appended</p>
                 <br><br>
-                Original <code>&lt;option&gt;</code> (or &lt;optgroup&gt;) element is accessible inside the specified function through the property <code>item.element</code>:
+                <p>
+                When attached to a <code>select</code> the original <code>&lt;option&gt;</code> (or &lt;optgroup&gt;) element is accessible inside the specified function through the property <code>item.element</code>:
                 <pre>
                     format(item) {
                         var originalOption = item.element;
-                        // return item.text
+                        return item.text
                     }
                 </pre>
+                </p>
             </td></tr>
             <tr><td>formatResult</td><td>function</td><td>
                 Function used to render a result that the user can select.
-                <pre>formatResult(object)</pre>
+                <pre>formatResult(object, container, query)</pre>
                 <table class="table table-bordered table-striped">
                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
                     <tr><td>object</td><td>object</td><td>One of the result objects returned from the <code>query</code> function</td></tr>
-                    <tr><td>&lt;returns&gt;</td><td>string</td><td>Html that represents the result</td></tr>
+                    <tr><td>container</td><td>jQuery object</td><td>jQuery wrapper of the node that should contain the representation of the result</td></tr>
+                    <tr><td>query</td><td>object</td><td>The query object used to request this set of results</td></tr>
+                    <tr><td>&lt;returns&gt;</td><td>string (optional)</td><td>Html string, a DOM element, or a jQuery object that represents the result</td></tr>
                 </table>
-                The default implementation expects the object to have a <code>text</code> property that is returned.
+                <p>The default implementation expects the object to have a <code>text</code> property that is returned.</p>
+                <p>The implementation may choose to append elements directly to the provided <code>container</code> object, or return a single value and have it automatically appended</p>
                 <br><br>
-                Original <code>&lt;option&gt;</code> (or &lt;optgroup&gt;) element is accessible inside the specified function through the property <code>item.element</code>:
+                <p>
+                When attached to a <code>select</code> the original <code>&lt;option&gt;</code> (or &lt;optgroup&gt;) element is accessible inside the specified function through the property <code>item.element</code>:
                 <pre>
                     format(item) {
                         var originalOption = item.element;
-                        // return item.text
+                        return item.text
                     }
                 </pre>
+                </p>
             </td></tr>
             <tr><td>formatNoMatches</td><td>function</td><td>
                 Function used to render the &quot;No matches&quot; message
diff --git a/select2-master b/select2-master
index 1605a631..d6f506e1 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 1605a631e5e35e920fecc57ff24c84056be705fc
+Subproject commit d6f506e16bbec859bb9fc39e1467112ed422ec0c