Skip to content
This repository has been archived by the owner on Jul 29, 2019. It is now read-only.

Commit

Permalink
Fix small timeline bug when defining timeline with no options and fix…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
yotamberk authored and mojoaxel committed Oct 24, 2016
1 parent 6adac31 commit ac1d6a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/timeline/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ <h2 id="Configuration_Options">Configuration Options</h2>
<td>Boolean</td>
<td>false</td>
<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>
</tr>

Expand Down Expand Up @@ -1028,7 +1028,7 @@ <h2 id="Configuration_Options">Configuration Options</h2>
<td>verticalScroll</td>
<td>Boolean</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>
</tr>

Expand Down
2 changes: 1 addition & 1 deletion lib/timeline/Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function Timeline (container, items, groups, options) {
minHeight: null
};
this.options = util.deepExtend({}, this.defaultOptions);
this.options.rtl = options.rtl;
if (options) { this.options.rtl = options.rtl; }

// Create the DOM, props, and emitter
this._create(container);
Expand Down

0 comments on commit ac1d6a6

Please sign in to comment.