Merged feature/table-index into develop

Author: Volker Thiel

README.md

@@ -10,7 +10,7 @@
 <img alt="" src="https://img.shields.io/badge/code_style-XO-5ed9c7.svg">
 <a href="https://www.codacy.com/app/pi0/bootstrap-vue?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bootstrap-vue/bootstrap-vue&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/efdefff98c8848a9b6038b164f10acc6"/></a>
 <img alt="" src="https://img.shields.io/badge/bootstrap-4.0.0--alpha.6-800080.svg">
-<img alt="" src="https://img.shields.io/badge/vue.js-2.1.10-green.svg">
+<img alt="" src="https://img.shields.io/badge/vue.js-2.2.0-green.svg">
 </p>
 
 # Getting started

components/alert.vue

@@ -70,7 +70,7 @@
                 this.dismissed = false;
 
                 // No timer for boolean values
-                if (this.show === true || this.show === false || this.show === null) {
+                if (this.show === true || this.show === false || this.show === null || this.show === 0) {
                     return;
                 }
 

components/button-radio.vue

@@ -11,6 +11,7 @@
                     :disabled="item.disabled"
                     v-html="item.text"
             />
+        </label>
     </div>
 </template>
 

components/form-fieldset.vue

@@ -42,7 +42,7 @@
             },
             labelSize: {
                 type: Number,
-                default: 3
+                default: 6
             },
             enabled: {
                 type: Boolean,

components/table.vue

@@ -3,17 +3,17 @@
         <thead>
         <tr>
             <th @click="headClick(field,key)"
-                :class="[field.sortable?'sorting':null,sort===key?'sorting_'+(sortDesc?'desc':'asc'):'']"
+                :class="[field.sortable?'sorting':null,sort===key?'sorting_'+(sortDesc?'desc':'asc'):'',field.class?field.class:null]"
                 v-for="field,key in fields"
             >
                 {{field.label}}
             </th>
         </tr>
         </thead>
         <tbody>
-        <tr v-for="item in _items" :key="items_key" :class="[item.state?'table-'+item.state:null]">
-            <td v-for="(field,key) in fields">
-                <slot :name="key" :value="item[key]" :item="item">{{item[key]}}</slot>
+        <tr v-for="(item,index) in _items" :key="items_key" :class="[item.state?'table-'+item.state:null]">
+            <td v-for="(field,key) in fields" :class="[field.class?field.class:null]">
+                <slot :name="key" :value="item[key]" :item="item" :index="index">{{item[key]}}</slot>
             </td>
         </tr>
         </tbody>

docs/data/site.js

@@ -14,7 +14,7 @@ export default {
             title: 'Components',
             slug: 'components',
             pages: [
-                {title: 'Alerts', new: true},
+                {title: 'Alerts'},
                 {title: 'Breadcrumb'},
                 {title: 'Buttons'},
                 {title: 'Button group'},
@@ -25,7 +25,7 @@ export default {
                 {title: 'Form Checkbox'},
                 {title: 'Form Select'},
                 {title: 'Nav'},
-                {title: 'NavBar', new: true},
+                {title: 'NavBar'},
                 {title: 'Pagination'},
                 {title: 'Popover', new: true},
                 {title: 'Tables', new: true}

docs/includes/sidebar.vue

@@ -9,6 +9,7 @@
                 <b-nav-item
                         v-for="page in group.pages"
                         :to="'/docs/'+group.slug+'/'+page.title.replace(' ','-').toLowerCase()"
+                        :key="group.slug"
                 >
                     {{ page.title }}
                     <span class="badge badge-danger" v-if="page.new">NEW</span>

docs/layouts/docs.vue

@@ -17,9 +17,9 @@
                 <div class="col-12 col-md-9 bd-content">
 
                     <b-button-group class="float-right mb-auto">
-                        <b-btn size="sm" @click="issue">Report an issue</b-btn>
-                        <b-btn size="sm" @click="editPage">Edit this page</b-btn>
-                        <slot name="actions"></slot>
+                        <b-btn variant="secondary" size="sm" @click="issue">Report an issue</b-btn>
+                        <b-btn variant="secondary" size="sm" @click="editPage">Edit this page</b-btn>
+                        <slot variant="secondary" name="actions"></slot>
                     </b-button-group>
 
                     <slot name="content"></slot>
@@ -32,10 +32,10 @@
             </div>
         </div>
 
-        <div class="container">
-            <div id="disqus_script"></div>
-            <div id="disqus_thread"></div>
-        </div>
+        <!--<div class="container">-->
+        <!--<div id="disqus_script"></div>-->
+        <!--<div id="disqus_thread"></div>-->
+        <!--</div>-->
 
     </layout>
 </template>
@@ -46,9 +46,7 @@
 
     export default {
         components: {layout, mSidebar},
-        data() {
-            return {};
-        },
+
         methods: {
             editPage() {
                 const base = 'https://github.com/bootstrap-vue/bootstrap-vue/tree/master/docs/pages';
@@ -66,18 +64,18 @@
             }
         },
         mounted() {
-            if (!document.disqus) {
-                const disqus_script = document.getElementById('disqus_script');
-                if (disqus_script) {
-                    const script = document.createElement('script');
-                    script.src = '//bootstrap-vue.disqus.com/embed.js';
-                    script.setAttribute('data-timestamp', Number(new Date()));
-                    disqus_script.appendChild(script);
-                    document.disqus = true;
-                }
-            } else if (window.DISQUS) {
-                window.DISQUS.reset({reload: true});
-            }
+//            if (!document.disqus) {
+//                const disqus_script = document.getElementById('disqus_script');
+//                if (disqus_script) {
+//                    const script = document.createElement('script');
+//                    script.src = '//bootstrap-vue.disqus.com/embed.js';
+//                    script.setAttribute('data-timestamp', Number(new Date()));
+//                    disqus_script.appendChild(script);
+//                    document.disqus = true;
+//                }
+//            } else if (window.DISQUS) {
+//                window.DISQUS.reset({reload: true});
+//            }
         }
     };
 </script>

docs/pages/docs/components/buttons.vue

@@ -15,7 +15,7 @@
                 <template
                         v-for="variant in ['primary','secondary','success','outline-success','warning','danger','link']">
                     <div class="col-md-4 pb-2" v-for="size in ['sm','','lg']">
-                        <b-button :size="size" :variant="variant" href="#">
+                        <b-button :size="size" :variant="variant" href="">
                             {{variant}} {{size}}
                         </b-button>
                     </div>

docs/pages/docs/components/form-fieldset.vue

@@ -10,16 +10,16 @@
 
         <template slot="demo">
 
-            <b-form-fieldset
-                    :feedback="text.length?'':'Please enter something'"
-                    description="We'll convert your name to lowercase automatically."
-                    label="Example Label"
-                    :state="text.length?'success':'warning'"
-            >
+                <b-form-fieldset
+                        :feedback="text.length?'':'Please enter something'"
+                        description="We'll convert your name to lowercase automatically."
+                        label="Example Label"
+                        :state="text.length?'success':'warning'"
+                >
 
-                <b-form-input v-model="text"></b-form-input>
+                    <b-form-input v-model="text"></b-form-input>
 
-            </b-form-fieldset>
+                </b-form-fieldset>
 
 
         </template>

docs/pages/docs/index.vue

@@ -79,13 +79,9 @@
 </template>
 
 <script>
-import site from '../../data/site';
 import layout from '../../layouts/docs.vue';
 
 export default {
-    components: {layout},
-    computed: {
-        site
-    }
+    components: {layout}
 };
 </script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "description": "Bootstrap 4 Components for Vue.js 2",
   "main": "dist/bootstrap-vue.common.js",
   "license": "MIT",
@@ -78,7 +78,7 @@
   "dependencies": {
     "bootstrap": "^4.0.0-",
     "tether": "latest",
-    "vue": "2.1.10"
+    "vue": "2.2.0"
   },
   "devDependencies": {
     "babel-core": "^6.22.1",
@@ -88,14 +88,14 @@
     "eslint-plugin-html": "^2.0.0",
     "highlightjs": "^9.8.0",
     "node-sass": "^4.5.0",
-    "nuxt": "0.9.7",
+    "nuxt": "^0.9.9",
     "postcss-loader": "^1.2.2",
-    "sass-loader": "^5.0.0",
+    "sass-loader": "^6.0.2",
     "vue-analytics": "^2.2.0",
     "vue-loader": "^10.0.2",
-    "vue-server-renderer": "2.1.10",
-    "vue-style-loader": "^2.0.0",
-    "vue-template-compiler": "2.1.10",
+    "vue-server-renderer": "2.2.0",
+    "vue-style-loader": "^2.0.2",
+    "vue-template-compiler": "^2.1.10",
     "webpack": "^2.2.0",
     "xo": "^0.17.1"
   },

scripts/webpack.common.js

@@ -1,15 +1,9 @@
-const Path = require('path');
-
 // Extend Base Config
 const config = module.exports = require('./webpack');
 
 // This is a node.js bundle
 config.target = 'node';
 
-config.entry = {
-    bootstrapVue: Path.resolve(__dirname, '../index')
-};
-
 // Output settings
 config.output.filename = 'bootstrap-vue.common.js';
 config.output.libraryTarget = 'commonjs2';

scripts/webpack.js

@@ -43,68 +43,16 @@ config.module = {
             test: /\.vue$/,
             loader: 'vue-loader'
         },
-        // Vue HTML
-        {
-            test: /\.html$/,
-            loader: 'vue-html-loader'
-        },
         // JS
         {
             test: /\.js$/,
             loader: 'babel-loader',
             // important: exclude files in node_modules, otherwise it's going to be really slow!
             exclude: /node_modules|vendor/
-        },
-        // JSON
-        {
-            test: /\.json$/,
-            loader: 'json-loader'
-        },
-        // CSS
-        {
-            test: /\.css$/,
-            loader: 'vue-style-loader!css-loader'
-        },
-        // SCSS
-        {
-            test: /\.scss$/,
-            loader: 'vue-style-loader!sass-loader'
-        },
-        // Font
-        {
-            test: /\.(eot|svg|ttf|woff|woff2)$/,
-            loader: 'file'
-        },
-        // Media
-        {
-            test: /\.(png|jpg|gif|svg)$/,
-            loader: 'url',
-            query: {
-                // limit for base64 inlining in bytes
-                limit: 10000,
-                // custom naming format if file is larger than the threshold
-                name: '[name].[ext]?[hash]'
-            }
-        },
-        // Node
-        {
-            test: /\.node$/,
-            loader: 'node-loader'
         }
     ]
 };
 
-// Config Vue style loader
-config.plugins.push(new Webpack.LoaderOptionsPlugin({
-    options: {
-        vue: {
-            loaders: {
-                scss: 'css-loader!sass-loader' // This will match all <style lang=scss> tags
-            }
-        }
-    }
-}));
-
 if (process.env.NODE_ENV === 'production') {
     // Production Config
     config.devtool = '#source-map';