Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/zikolach/vue-tour into fe…
Browse files Browse the repository at this point in the history
…ature/zikolach-master

# Conflicts:
#	package-lock.json
#	src/components/VStep.vue
  • Loading branch information
mmorainville committed Sep 2, 2018
2 parents d18fca6 + d559e71 commit f5f3e00
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/components/VStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,17 @@ export default {
// console.log('[Vue Tour] The target element ' + this.step.target + ' of .v-step[id="' + this.hash + '"] is:', targetElement)
if (targetElement) {
let jumpOptions = {
duration: this.step.duration || 1000,
offset: this.step.offset || 0,
callback: undefined,
a11y: false
if (this.params.scroll) {
let jumpOptions = {
duration: this.step.duration || 1000,
offset: this.step.offset || 0,
callback: undefined,
a11y: false
}
jump(targetElement, jumpOptions)
}
jump(targetElement, jumpOptions)
// targetElement.scrollIntoView({ behavior: "smooth" })
/* eslint-disable no-new */
this._data._popper = new Popper(
targetElement,
Expand Down
1 change: 1 addition & 0 deletions src/shared/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const DEFAULT_OPTIONS = {

export const DEFAULT_STEP_OPTIONS = {
placement: 'bottom',
scroll: true,
modifiers: {
arrow: {
element: '.v-step__arrow'
Expand Down

0 comments on commit f5f3e00

Please sign in to comment.