fix(carousel): remove un-needed aria- atribute on slides (#1448)

* fix(carousel): remove un-needed `aria-` atribute on slides * Update carousel.js * update carousel test code * ESLint
bootstrap-vue · Dec 11, 2017 · 260919f · 260919f
1 parent a9bddbd
commit 260919f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/carousel/carousel.js b/src/components/carousel/carousel.js
@@ -321,7 +321,6 @@ export default {
       const index = Math.max(0, Math.min(Math.floor(this.index), numSlides - 1))
       this.slides.forEach((slide, idx) => {
         const n = idx + 1
-        const id = this.safeId(`__BV_indicator_${n}_`)
         if (idx === index) {
           addClass(slide, 'active')
         } else {
@@ -331,9 +330,6 @@ export default {
         setAttr(slide, 'aria-posinset', String(n))
         setAttr(slide, 'aria-setsize', String(numSlides))
         slide.tabIndex = -1
-        if (id) {
-          setAttr(slide, 'aria-controlledby', id)
-        }
       })
       // Set slide as active
       this.setSlide(index)
@@ -390,6 +386,7 @@ export default {
       addClass(nextSlide, direction.dirClass)
       // Transition End handler
       let called = false
+      /* istanbul ignore next: dificult to test */
       const onceTransEnd = (evt) => {
         if (called) {
           return
@@ -453,6 +450,7 @@ export default {
       attributeFilter: [ 'id' ]
     })
   },
+  /* istanbul ignore next: dificult to test */
   beforeDestroy () {
     clearInterval(this.intervalId)
     clearTimeout(this._animationTimeout)

diff --git a/src/components/carousel/fixtures/carousel.js b/src/components/carousel/fixtures/carousel.js
@@ -4,6 +4,11 @@ window.app = new Vue({
     slide: 0,
     sliding: null
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.slide = 2
+    })
+  },
   methods: {
     blankImg (x, y) {
       // Return a blank SVG image with specified width and height