Merge branch 'alpha' of github.com:bootstrap-vue/bootstrap-vue into alpha

Pooya Parsa · Pooya Parsa · commit 738c0befb12b · 2017-08-31T02:02:53.000+04:30
diff --git a/README.md b/README.md
@@ -31,64 +31,7 @@
 
 > [Bootstrap 4](https://v4-alpha.getbootstrap.com/) components for [Vue.js 2](https://vuejs.org/)
 
-### ✨ We are heavily working for stable `1.0.0` release and Bootstrap v4-beta support. For earlier access please refer to [1.x](https://github.com/bootstrap-vue/bootstrap-vue/tree/1.x) branch and [Beta Docs](https://bootstrap-vue.now.sh)
-
-# Links
-
-- 📘 [Documentation](https://bootstrap-vue.js.org)
-- 🔥 [Documentation (Beta)](https://bootstrap-vue.now.sh)
-- 🔨 [Release Notes](https://bootstrap-vue.js.org/docs/changelog)
-- 💬 [Slack Community](https://bootstrap-vue.slack.com)
-
-# Quick Start
-Please refer to [Official Documentation](https://bootstrap-vue.github.io) for setup guide, examples and documentation.
-
-1. Download dependencies:
-```bash
-yarn add bootstrap-vue
-yarn add bootstrap@4.0.0-alpha.6
-yarn add -D style-loader
-```
-
-2. Register BootstrapVue in your app entrypoint:
-```js
-import Vue from 'vue'
-import BootstrapVue from 'bootstrap-vue'
-
-Vue.use(BootstrapVue)
-```
-
-3. Import styles using style-loader:
-```js
-import 'bootstrap/dist/css/bootstrap.css'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-```
-
-##### For users of Webpack or Webpack-Simple from `vue-cli` follow these instructions:
-1. Download the dependencies:
-```bash
-yarn add bootstrap-vue
-yarn add bootstrap@4.0.0-alpha.6
-yarn add -D style-loader
-```
-
-2. In `src/main.js`, add the following lines, in priority order:
-```js
-import Vue from 'vue'
-/* ( there may be other imports here ) */
-import BootstrapVue from 'bootstrap-vue/dist/bootstrap-vue.esm'
-import 'bootstrap-vue/dist/bootstrap-vue.css'
-import 'bootstrap/dist/css/bootstrap.css'
-/* ( there may be other imports here ) */
-
-Vue.use(BootstrapVue)
-```
-
-#### Note on style-loader:
-If you are unable or do not want to add style-loader as a developer dependency, you have to
-manually include both [Bootstrap's](https://v4-alpha.getbootstrap.com/getting-started/download/)
-and [BootstrapVue's](https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.css) CSS files
-in your bundle or reference them from `static/` via `index.html`.
+This branch is for legacy 4.0.0-alpha.6 release of Bootstrap. [Alpha docs](https://bootstrap-vue-alpha.surge.sh)
 
 # License
 MIT
diff --git a/docs/nuxt/layouts/docs.vue b/docs/nuxt/layouts/docs.vue
@@ -6,8 +6,8 @@
             <div class="row">
                 <div class="col-12 col-md-9">
                     <div class="float-right">
-                        <a href="https://github.com/bootstrap-vue/bootstrap-vue/releases" target="_blank">
-                            <img src="https://img.shields.io/github/release/bootstrap-vue/bootstrap-vue.svg?style=flat-square" alt="GitHub release">
+                        <a href="https://github.com/bootstrap-vue/bootstrap-vue/tags" target="_blank">
+                            <img src="https://img.shields.io/github/tag/bootstrap-vue/bootstrap-vue.svg?style=flat-square" alt="GitHub release">
                         </a>
                     </div>
     
diff --git a/lib/components/alert.vue b/lib/components/alert.vue
@@ -99,8 +99,7 @@
                 }
 
                 let dismissCountDown = this.show;
-                this.$emit('dismiss-count-down', dismissCountDown);
-
+                
                 // Start counter
                 this.clearCounter();
                 this.countDownTimerId = setInterval(() => {
diff --git a/lib/components/tab.vue b/lib/components/tab.vue
@@ -1,5 +1,8 @@
 <template>
-    <transition @before-enter="beforeEnter" @after-enter="afterEnter" @after-leave="afterLeave" mode="out-in">
+    <transition @before-enter="beforeEnter"
+                @after-enter="afterEnter"
+                @after-leave="afterLeave"
+                mode="out-in">
         <component :is="tag"
                    :id="id || null"
                    role="tabpanel"
@@ -9,8 +12,7 @@
                    :aria-lablelledby="controlledBy || null"
                    v-if="localActive || !lazy"
                    v-show="localActive"
-                   ref="panel"
-                   :css="false">
+                   ref="panel">
              <slot></slot>
         </component>
     </transition>
@@ -32,11 +34,14 @@
         data() {
             return {
                 fade: false,
-                localActive: this.active,
+                localActive: this.active && !this.disabled,
                 lazy: true,
                 show: false
             };
         },
+        mounted() {
+            this.show = this.localActive;
+        },
         computed: {
             controlledBy() {
                 return this.buttonId || (this.id ? (this.id + '__BV_tab_button__') : null);

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,7 @@`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`let dismissCountDown = this.show;`
`102`		`- this.$emit('dismiss-count-down', dismissCountDown);`
`103`		`-`
	`102`	`+`
`104`	`103`	`// Start counter`
`105`	`104`	`this.clearCounter();`
`106`	`105`	`this.countDownTimerId = setInterval(() => {`