From 02faf940542f6820eb9ec55bf5e99ec9b0048746 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Fri, 31 May 2013 15:22:16 -0700
Subject: [PATCH] docs for #1365 placeholderOption option

---
 select2-latest.html |  6 ++++++
 select2-master      |  2 +-
 select2-test.html   | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/select2-latest.html b/select2-latest.html
index 01a05034..727f5751 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1082,6 +1082,12 @@ $(document).ready(function () {
                     for the placeholder to work.
                 </p>
             </td></tr>
+            <tr><td>placeholderOption</td><td>function/string</td><td>
+                <p>When attached to a <code>select</code> resolves the <code>option</code> that should be used as the placeholder.
+                    Can either be a function which given the <code>select</code> element should return the <code>optoin</code>
+                    element or a string <code>first</code> to indicate that the first option should be used.</p>
+                <p>This option is useful when Select2's default of using the first option only if it has no value and no text is not suitable.</p>
+            </td></tr>
             <tr><td>separator</td><td>string</td><td>
                 <p>
                     Separator character or string used to delimit ids in <code>value</code> attribute of the multi-valued selects.
diff --git a/select2-master b/select2-master
index 87e62004..9a3666ed 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 87e62004f67179afe5809d525f957bde8acacc78
+Subproject commit 9a3666edb56339e95aaf9f2fdeb76b48030cf50a
diff --git a/select2-test.html b/select2-test.html
index cf6bbdb9..3d6eb707 100644
--- a/select2-test.html
+++ b/select2-test.html
@@ -48,8 +48,24 @@
 -->
 </div>
 
+
+<input id="filter" multiple style="width: 250px;">
+
+<button id='reset' class='btn'>Reset</button>
+
 <script>
     $(document).ready(function() {
+
+
+        $('#filter').select2({
+            multiple: true,
+            data:[{id:0,text:'enhancement'},{id:1,text:'bug'}]
+        });
+        $('#reset').on('click', function() {
+            $('#filter').select2('val','');
+        });
+
+
         function format(state) {
             if (!state.id) return state.text; // optgroup
             return "<img class='flag' src='images/flags/" + state.id.toLowerCase() + ".png'/>" + state.text;