Skip to content

Commit d953e1a

Browse files
wffrancowffranco
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages
2 parents 1f6f7dc + 4c17262 commit d953e1a

17 files changed

+1324
-1120
lines changed

‎build/build-docs.js

Lines changed: 611 additions & 534 deletions
Large diffs are not rendered by default.

‎build/build-docs.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-strap.js

Lines changed: 532 additions & 469 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-strap.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue-strap.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/example/docTable.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ export default {
6363
ready () {
6464
const container = this._slotContents.default
6565
if (container) {
66-
$(container.children).each((option) => {
67-
if(option && option.children) this.options.push($(option.children).innerHTML)
66+
$(container.children).each(option => {
67+
if(option && option.children) this.options.push($(option.children).map(el => el.innerHTML))
6868
})
6969
}
7070
}

‎docs/example/typeaheadDocs.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@
106106
<p></p>
107107
<p>An HTTP URL for asynchronous suggestions. Expected to return a JSON object.</p>
108108
</div>
109+
<div>
110+
<p>delay</p>
111+
<p><code>Number</code></p>
112+
<p><code>200</code></p>
113+
<p>Delay before calling async data while typing.</p>
114+
</div>
109115
<div>
110116
<p>limit</p>
111117
<p><code>Number</code></p>

‎index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
</head>
1919
<body>
2020
<body-docs></body-docs>
21-
<!-- using cdn version here so it works under gh-pages -->
2221
<script src="docs/js/vue.min.js"></script>
2322
<script src="dist/vue-strap-lang.js"></script>
2423
<script src="build/build-docs.js"></script>

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-strap",
3-
"version": "1.1.31",
3+
"version": "1.1.32",
44
"description": "Bootstrap components built with Vue.js",
55
"main": "dist/vue-strap.js",
66
"repository": {
@@ -23,10 +23,10 @@
2323
"dist"
2424
],
2525
"keywords": [
26-
"vue",
26+
"bootstrap",
2727
"vue-bootstrap",
2828
"vue-component",
29-
"bootstrap"
29+
"vue"
3030
],
3131
"devDependencies": {
3232
"babel-core": "^6.17.0",
@@ -64,12 +64,12 @@
6464
]
6565
},
6666
"scripts": {
67-
"docs": "webpack-dev-server --inline --hot --quiet",
68-
"builddocs": "webpack --progress --hide-modules && set NODE_ENV=production webpack --progress --hide-modules",
6967
"build": "webpack --progress --hide-modules --config webpack.build.min.js && webpack --progress --hide-modules --config webpack.build.js",
70-
"version": "npm run build && git add -A dist",
68+
"builddocs": "webpack --progress --hide-modules && set NODE_ENV=production webpack --progress --hide-modules",
69+
"docs": "webpack-dev-server --inline --hot --quiet",
70+
"gpages": "gh-pages -d build",
7171
"postversion": "git push && git push --tags",
72-
"gpages": "gh-pages -d build"
72+
"version": "npm run build && git add -A dist"
7373
},
7474
"author": "yuche",
7575
"license": "MIT"

‎src/Popover.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</template>
1818

1919
<script>
20-
import PopoverMixin from './popoverMixins.js'
20+
import PopoverMixin from './utils/popoverMixins.js'
2121
2222
export default {
2323
mixins: [PopoverMixin],

0 commit comments

Comments
 (0)