Browse Source

Merge pull request #1 from almende/develop

Update with Develop
codeClimate
Coleman Kane 9 years ago
parent
commit
aaa5aadd6d
2 changed files with 12 additions and 12 deletions
  1. +5
    -5
      docs/graph2d/index.html
  2. +7
    -7
      docs/timeline/index.html

+ 5
- 5
docs/graph2d/index.html View File

@ -383,8 +383,8 @@ groups.add({
<tr> <tr>
<td>visible</td> <td>visible</td>
<td>Boolean</td> <td>Boolean</td>
<td>true</td>
<td>This field is optional. If false, this group will not be drawn.
<td>no</td>
<td>This field is optional. If false, this group will not be drawn. By default it is true.
</tr> </tr>
</table> </table>
@ -901,14 +901,14 @@ function (option, path) {
<td>locale</td> <td>locale</td>
<td>String</td> <td>String</td>
<td>none</td> <td>none</td>
<td>Select a locale for the Graph2d. See section <a href="timeline.html#Localization">Localization</a> for more information.</td>
<td>Select a locale for the Graph2d. See section <a href="#Localization">Localization</a> for more information.</td>
</tr> </tr>
<tr> <tr>
<td>locales</td> <td>locales</td>
<td>Object</td> <td>Object</td>
<td>none</td> <td>none</td>
<td>A map with i18n locales. See section <a href="timeline.html#Localization">Localization</a> for more information.</td>
<td>A map with i18n locales. See section <a href="#Localization">Localization</a> for more information.</td>
</tr> </tr>
<tr> <tr>
@ -1492,4 +1492,4 @@ var options = {
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.js"></script> <script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script>
<script src="../js/main.js"></script>

+ 7
- 7
docs/timeline/index.html View File

@ -939,6 +939,13 @@ function (option, path) {
<td>A template function used to generate the contents of the items. The function is called by the Timeline with an items data as argument, and must return HTML code as result. When the option template is specified, the items do not need to have a field <code>content</code>. See section <a href="#Templates">Templates</a> for a detailed explanation.</td> <td>A template function used to generate the contents of the items. The function is called by the Timeline with an items data as argument, and must return HTML code as result. When the option template is specified, the items do not need to have a field <code>content</code>. See section <a href="#Templates">Templates</a> for a detailed explanation.</td>
</tr> </tr>
<tr>
<td>throttleRedraw</td>
<td>number</td>
<td><code>0</code></td>
<td>Limit the maximum number of redraws to once every x milliseconds. For example setting throttleRedraw to `100` milliseconds will limit the number of redraws to 10 times per second.</td>
</tr>
<tr class='toggle collapsible' onclick="toggleTable('optionTable','timeAxis', this);"> <tr class='toggle collapsible' onclick="toggleTable('optionTable','timeAxis', this);">
<td><span parent="timeAxis" class="right-caret"></span> timeAxis</td> <td><span parent="timeAxis" class="right-caret"></span> timeAxis</td>
<td>Object</td> <td>Object</td>
@ -956,13 +963,6 @@ function (option, path) {
</td> </td>
</tr> </tr>
<tr parent="timeAxis" class="hidden">
<td class="indent">throttleRedraw</td>
<td>number</td>
<td><code>0</code></td>
<td>Limit the maximum number of redraws to once every x milliseconds. For example setting throttleRedraw to `100` milliseconds will limit the number of redraws to 10 times per second.</td>
</tr>
<tr parent="timeAxis" class="hidden"> <tr parent="timeAxis" class="hidden">
<td class="indent">timeAxis.step</td> <td class="indent">timeAxis.step</td>
<td>number</td> <td>number</td>

Loading…
Cancel
Save