From c08295fc3c6cdf5900315a1e9d91dfa7d95d8603 Mon Sep 17 00:00:00 2001
From: UltCombo <ult_combo@hotmail.com>
Date: Mon, 20 Jan 2014 00:30:42 -0200
Subject: [PATCH] Document disabled options; update query options.callback's
 result.results; closes #1626 (2)

---
 index.html          | 37 ++++++++++++++++++++++++++++++++++++-
 select2-latest.html | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 9619af90..c7f75ef2 100644
--- a/index.html
+++ b/index.html
@@ -970,6 +970,41 @@ $("#e18,#e18_2").select2();
           </div>
       </article>
 
+      <article class="row" id="disabled-options">
+          <script id="script_e24">
+
+              $(document).ready(function () {
+                  $('#e24').select2({
+                      query: function (query){
+                          var data = {
+                              results: [
+                                  { id: 1, text: "I'm selectable" },
+                                  { id: 2, text: "I'm a disabled option", disabled: true },
+                                  { id: 3, text: "I'm selectable too!" }
+                              ]
+                          };
+
+                          query.callback(data);
+                      }
+                  });
+              });
+          </script>
+          <div class="span12">
+              <h3>Disabled options</h3>
+              <p>
+                  In case that you need to disable certain options so that they can't be selected by the select2 interface, you can now pass in <code>disabled: true</code> with your data. Please note: This also works for incoming values from ajax. When attached to a <code>&lt;select&gt;</code> element, Select2 will respect its <code>&lt;option&gt;</code> elements' <code>disabled</code> property.
+              </p>
+              <p>
+                  <input type="hidden" id="e24" style="width:300px;"/>
+              </p>
+          </div>
+          <div class="span12">
+              <h3>Example Code</h3>
+              <pre class="prettyprint linenums" id="code_e24">
+              </pre>
+          </div>
+      </article>
+
       <article class="row" id="locked-selections">
           <script id="script_e21">
 
@@ -1406,7 +1441,7 @@ $("#select").select2({
                             <td>Callback function that should be called with the <code>result</code> object. The result object:
                                 <table class="table table-bordered table-striped">
                                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
-                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> attribute is required</code>, even if custom renderers are used. The object may also contain a <code>children</code>key if hierarchical data is displayed.</td></tr>
+                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> attribute is required</code>, even if custom renderers are used. The object may also contain a <code>children</code>key if hierarchical data is displayed. The object may also contain a <code>disabled</code> boolean property indicating whether this result can be selected.</td></tr>
                                     <tr><td>result.more</td><td>boolean</td><td><code>true</code>if more results are available for the current search term.</td></tr>
                                     <tr><td>results.context</td><td>object</td><td>A user-defined object that should be made available as the <code>context</code> parameter to the <code>query</code> function on subsequent queries to load more result pages for the same search term. See the description of <a href="#doc-query-options-context">options.context</code></a> parameter.</td></tr>
                                 </table>
diff --git a/select2-latest.html b/select2-latest.html
index 4d8fdf84..3ad008f9 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -976,6 +976,41 @@ $("#e18,#e18_2").select2();
           </div>
       </article>
 
+      <article class="row" id="disabled-options">
+          <script id="script_e24">
+
+              $(document).ready(function () {
+                  $('#e24').select2({
+                      query: function (query){
+                          var data = {
+                              results: [
+                                  { id: 1, text: "I'm selectable" },
+                                  { id: 2, text: "I'm a disabled option", disabled: true },
+                                  { id: 3, text: "I'm selectable too!" }
+                              ]
+                          };
+
+                          query.callback(data);
+                      }
+                  });
+              });
+          </script>
+          <div class="span12">
+              <h3>Disabled options</h3>
+              <p>
+                  In case that you need to disable certain options so that they can't be selected by the select2 interface, you can now pass in <code>disabled: true</code> with your data. Please note: This also works for incoming values from ajax. When attached to a <code>&lt;select&gt;</code> element, Select2 will respect its <code>&lt;option&gt;</code> elements' <code>disabled</code> property.
+              </p>
+              <p>
+                  <input type="hidden" id="e24" style="width:300px;"/>
+              </p>
+          </div>
+          <div class="span12">
+              <h3>Example Code</h3>
+              <pre class="prettyprint linenums" id="code_e24">
+              </pre>
+          </div>
+      </article>
+
       <article class="row" id="locked-selections">
           <script id="script_e21">
 
@@ -1412,7 +1447,7 @@ $("#select").select2({
                             <td>Callback function that should be called with the <code>result</code> object. The result object:
                                 <table class="table table-bordered table-striped">
                                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
-                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> attribute is required</code>, even if custom renderers are used. The object may also contain a <code>children</code>key if hierarchical data is displayed.</td></tr>
+                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> property is required</code>, even if custom renderers are used. The object may also contain a <code>children</code> key if hierarchical data is displayed. The object may also contain a <code>disabled</code> boolean property indicating whether this result can be selected.</td></tr>
                                     <tr><td>result.more</td><td>boolean</td><td><code>true</code>if more results are available for the current search term.</td></tr>
                                     <tr><td>results.context</td><td>object</td><td>A user-defined object that should be made available as the <code>context</code> parameter to the <code>query</code> function on subsequent queries to load more result pages for the same search term. See the description of <a href="#doc-query-options-context">options.context</code></a> parameter.</td></tr>
                                 </table>