Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs

Author: jlukic

README.md

@@ -43,7 +43,7 @@ gulp build-docs
 By default, docs build to `build-docs/` (from the adjacent folder `docs/`). 
 **The command _must_ be run from your UI folder!** (In the above example, we use `./ui`.) 
 
-To configure a different `docs` location, modify [ `tasks/docs.json`](https://github.com/Semantic-Org/Semantic-UI/blob/master/tasks/admin/docs.json) accordingly.
+To configure a different `docs` location, modify [ `tasks/config/docs.js`](https://github.com/Semantic-Org/Semantic-UI/blob/master/tasks/config/docs.js) accordingly.
 
 
 ### Running the Server

docpad.coffee

@@ -29,7 +29,7 @@ docpadConfig = {
 			# Here are some old site urls that you would like to redirect from
 			oldUrls: [],
 
-			version: "2.1.8",
+			version: "2.2.0",
 
 			branch: "master",
 

server/documents/behaviors/api.html.eco

@@ -822,7 +822,7 @@ type        : 'UI Behavior'
 
         <div class="no async mocked example">
           <h4 class="ui header">Using Custom Backends</h4>
-          <p>Using <code>mockResponseAsync</code> you can specify a function which can execute your API request. This allows for you to use custom backends or wrappers outside of <code>$.ajax</code> for integrating API requests.</p>
+          <p>Using <code>responseAsync</code> you can specify a function which can execute your API request. This allows for you to use custom backends or wrappers outside of <code>$.ajax</code> for integrating API requests.</p>
           <div class="code" data-type="javascript" data-demo="true">
             $('.async.mocked .button')
               .api({
@@ -1258,6 +1258,11 @@ type        : 'UI Behavior'
           </td>
           <td>Metadata used to store XHR and response promise</td>
         </tr>
+        <tr>
+          <td>silent</td>
+          <td>False</td>
+          <td>Silences all console output including error messages, regardless of other debug settings.</td>
+        </tr>
         <tr>
           <td>debug</td>
           <td>false</td>

server/documents/behaviors/form.html.eco

@@ -1063,6 +1063,7 @@ type        : 'UI Behavior'
         ;
       </div>
     </div>
+
     <div class="length example">
       <h4 class="ui header">Length</h4>
       <p>Inputs can match against length of content</p>
@@ -1414,6 +1415,47 @@ type        : 'UI Behavior'
       </form>
     </div>
 
+    <div class="depends example">
+      <h4 class="ui header">
+        Dependent Fields
+        <div class="ui teal horizontal label">New in 2.2</div>
+      </h4>
+      <p>You can specify validation fields to only be used when other fields are present. Simply add <code>depends: 'id'</code> with the ID of the field that must be non-blank for this rule to evaluate.</p>
+      <div class="ignored code">
+      $('.ui.form')
+        .form({
+          fields: {
+            yearsPracticed: {
+              identifier : 'yearsPracticed',
+              depends    : 'isDoctor',
+              rules      : [
+                {
+                  type   : 'empty',
+                  prompt : 'Please enter the number of years you have been a doctor'
+                }
+              ]
+            }
+          }
+        })
+      ;
+      </div>
+      <form class="ui form segment">
+        <div class="inline field">
+          <div class="ui checkbox">
+            <input type="checkbox" name="isDoctor" />
+            <label>Are you a doctor?</label>
+          </div>
+        </div>
+        <div class="field">
+          <label>How long have you been a medical professional</label>
+          <input type="text" name="yearsPracticed">
+        </div>
+        <div class="ui divider"></div>
+        <div class="ui blue submit button">Submit</div>
+        <div class="ui error message"></div>
+      </form>
+    </div>
+
     <div class="optional example">
       <h4 class="ui header">Optional Fields</h4>
       <p>Adding the parameter <code>optional: true</code> will only add your validation rules when the field is <b>not empty</b>.

server/documents/behaviors/state.html.eco

@@ -387,6 +387,11 @@ type        : 'Draft'
           </td>
           <td>Metadata used to store xhr and response promise</td>
         </tr>
+        <tr>
+          <td>silent</td>
+          <td>False</td>
+          <td>Silences all console output including error messages, regardless of other debug settings.</td>
+        </tr>
         <tr>
           <td>debug</td>
           <td>false</td>