Move fields into functions

Author: tbranyen

index.html

@@ -124,34 +124,6 @@ <h3>API Documentation</h3>
                     -->
                   </div>
 
-                  <h4>Properties:</h4>
-                  <ul class="properties inner-block">
-                    {%if not fields%}
-                    <li>No properties available.</li>
-                    {%elsif not fields.length%}
-                    <li>No properties available.</li>
-                    {%else%}
-                    <li>
-                      <table class="pure-table">
-                        <thead>
-                          <tr>
-                            <th><sub>Name</sub></th>
-                            <th><sub>Type</sub></th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          {%each fields as field%}
-                          <tr id="{{jsClassName}}/field/{{field.name}}">
-                            <td><strong>{{field.name}}</strong></td>
-                            <td>{{ field.jsClassName }}</td>
-                          </tr>
-                          {%endeach%}
-                        </tbody>
-                      </table>
-                    </li>
-                    {%endif%}
-                  </ul>
-
                   <h4>Functions:</h4>
                     {%if not functions%}
                   <ul class="functions inner-block">

scripts/api.js

@@ -48,10 +48,23 @@
 
       content.append(contentOutput);
 
+      // Join the fields and functions (they are both functions).
+      if (ctor.fields && ctor.functions) {
+        ctor.functions.push.apply(ctor.functions, ctor.fields);
+      }
+      else {
+        ctor.functions = ctor.functions || ctor.fields;
+      }
+
       (ctor.functions||[]).forEach(function(func) {
         var isPrototype = func.isPrototypeMethod ? "#" : ".";
         anchor.find(".subnav").append("<a href='#" + ctor.jsClassName + "/function/" + func.jsFunctionName + "'><li>" + ctor.jsClassName + isPrototype + func.jsFunctionName + "</li></a>");
       });
+
+      (ctor.fields||[]).forEach(function(field) {
+        var isPrototype = "#";
+        anchor.find(".subnav").append("<a href='#" + ctor.jsClassName + "/function/" + func.jsFunctionName + "'><li>" + ctor.jsClassName + isPrototype + func.jsFunctionName + "</li></a>");
+      });
     });
 
     // Size the navigation bar correctly.