Browse Source

Fix small timeline bug when defining timeline with no options and fix docs explanations (#2216)

* Add initial scroller without options
* Add initial scroll without an option
* Add verticalScroll option
* Fix scrollbar positions
* Add docs
* fix example
* remove jquery dependency
* Fix example
* Fix review comments
* Fix verticalScroll and horizontalScroll docs
* Fix bug in timeline option.rtl if otion is undefined
codeClimate
yotamberk 8 years ago
committed by Alexander Wunschik
parent
commit
ac1d6a6a96
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      docs/timeline/index.html
  2. +1
    -1
      lib/timeline/Timeline.js

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

@ -680,7 +680,7 @@ function (option, path) {
<td>Boolean</td> <td>Boolean</td>
<td>false</td> <td>false</td>
<td>This option allows you to scroll horizontally to move backwards and forwards in the time range. <td>This option allows you to scroll horizontally to move backwards and forwards in the time range.
Only applicable when option <code>zoomCtrl</code> is defined or <code>zoomable</code> is <code>false</code>.
Only applicable when option <code>zoomCtrl</code> is defined or <code>zoomable</code> is <code>false</code>. Notice that defining this option as <code>true</code> will override <code>verticalScroll</code> scroll event but not eliminate the vertical scrollbar.
</td> </td>
</tr> </tr>
@ -1028,7 +1028,7 @@ function (option, path) {
<td>verticalScroll</td> <td>verticalScroll</td>
<td>Boolean</td> <td>Boolean</td>
<td>false</td> <td>false</td>
<td> Show a vertical scroll on the side of the group list.
<td> Show a vertical scroll on the side of the group list and link it to the scroll event when zoom is not triggered. Notice that defining this option as <code>true</code> will NOT override <code>horizontalScroll</code>. The scroll event will be vertically ignored, but a vertical scrollbar will be visible
</td> </td>
</tr> </tr>

+ 1
- 1
lib/timeline/Timeline.js View File

@ -60,7 +60,7 @@ function Timeline (container, items, groups, options) {
minHeight: null minHeight: null
}; };
this.options = util.deepExtend({}, this.defaultOptions); this.options = util.deepExtend({}, this.defaultOptions);
this.options.rtl = options.rtl;
if (options) { this.options.rtl = options.rtl; }
// Create the DOM, props, and emitter // Create the DOM, props, and emitter
this._create(container); this._create(container);

Loading…
Cancel
Save