Commit c6487ddfc2187d82723b1a486b25fbb0503aa9de
1 parent
ed14d577
update dependencies
Showing
9 changed files
with
282 additions
and
79 deletions
Show diff stats
examples/app.vue
| @@ -57,6 +57,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; } | @@ -57,6 +57,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; } | ||
| 57 | <li><router-link to="/avatar">Avatar</router-link></li> | 57 | <li><router-link to="/avatar">Avatar</router-link></li> |
| 58 | <li><router-link to="/color-picker">ColorPicker</router-link></li> | 58 | <li><router-link to="/color-picker">ColorPicker</router-link></li> |
| 59 | <li><router-link to="/auto-complete">AutoComplete</router-link></li> | 59 | <li><router-link to="/auto-complete">AutoComplete</router-link></li> |
| 60 | + <li><router-link to="/scroll">Scroll</router-link></li> | ||
| 60 | </ul> | 61 | </ul> |
| 61 | </nav> | 62 | </nav> |
| 62 | <router-view></router-view> | 63 | <router-view></router-view> |
examples/main.js
| @@ -192,6 +192,10 @@ const router = new VueRouter({ | @@ -192,6 +192,10 @@ const router = new VueRouter({ | ||
| 192 | { | 192 | { |
| 193 | path: '/auto-complete', | 193 | path: '/auto-complete', |
| 194 | component: require('./routers/auto-complete.vue') | 194 | component: require('./routers/auto-complete.vue') |
| 195 | + }, | ||
| 196 | + { | ||
| 197 | + path: '/scroll', | ||
| 198 | + component: require('./routers/scroll.vue') | ||
| 195 | } | 199 | } |
| 196 | ] | 200 | ] |
| 197 | }); | 201 | }); |
examples/routers/back-top.vue
| 1 | +<template> | ||
| 2 | + <Scroll :on-reach-edge="loadData" loading-text="L-o-a-d-i-n-g..."> | ||
| 3 | + <section v-for="item in list"> | ||
| 4 | + <div class="city"> | ||
| 5 | + <p>{{ item }}</p> | ||
| 6 | + </div> | ||
| 7 | + </section> | ||
| 8 | + </Scroll> | ||
| 9 | +</template> | ||
| 10 | +<script> | ||
| 11 | + export default { | ||
| 12 | + data () { | ||
| 13 | + return { | ||
| 14 | + list: [1,2,3,4,5,6,7,8,9,10] | ||
| 15 | + } | ||
| 16 | + }, | ||
| 17 | + methods: { | ||
| 18 | + loadData (dir) { | ||
| 19 | + return new Promise(resolve => { | ||
| 20 | + setTimeout(() => { | ||
| 21 | + if (dir > 0) { | ||
| 22 | + const first = this.list[0]; | ||
| 23 | + for (let i = 1; i < 11; i++) { | ||
| 24 | + this.list.unshift(first - i); | ||
| 25 | + } | ||
| 26 | + } else { | ||
| 27 | + const last = this.list[this.list.length - 1]; | ||
| 28 | + for (let i = 1; i < 11; i++) { | ||
| 29 | + this.list.push(last + i); | ||
| 30 | + } | ||
| 31 | + } | ||
| 32 | + resolve(); | ||
| 33 | + }, 500); | ||
| 34 | + }); | ||
| 35 | + } | ||
| 36 | + } | ||
| 37 | + } | ||
| 38 | +</script> | ||
| 39 | +<style> | ||
| 40 | + section { | ||
| 41 | + margin: 20px; | ||
| 42 | + } | ||
| 43 | + section > div { | ||
| 44 | + width: 300px; | ||
| 45 | + padding: 15px; | ||
| 46 | + margin: 5px; | ||
| 47 | + background-color: #ddf; | ||
| 48 | + border: 1px solid #446; | ||
| 49 | + border-radius: 5px; | ||
| 50 | + margin: 0 auto; | ||
| 51 | + } | ||
| 52 | + | ||
| 53 | + .ivu-scroll-container { | ||
| 54 | + height: 500px; | ||
| 55 | + } | ||
| 56 | +</style> |
package-lock.json
| @@ -185,6 +185,12 @@ | @@ -185,6 +185,12 @@ | ||
| 185 | "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", | 185 | "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", |
| 186 | "dev": true | 186 | "dev": true |
| 187 | }, | 187 | }, |
| 188 | + "array-find-index": { | ||
| 189 | + "version": "1.0.2", | ||
| 190 | + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", | ||
| 191 | + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", | ||
| 192 | + "dev": true | ||
| 193 | + }, | ||
| 188 | "array-flatten": { | 194 | "array-flatten": { |
| 189 | "version": "2.1.1", | 195 | "version": "2.1.1", |
| 190 | "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", | 196 | "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", |
| @@ -1642,6 +1648,24 @@ | @@ -1642,6 +1648,24 @@ | ||
| 1642 | "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", | 1648 | "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", |
| 1643 | "dev": true | 1649 | "dev": true |
| 1644 | }, | 1650 | }, |
| 1651 | + "camelcase-keys": { | ||
| 1652 | + "version": "2.1.0", | ||
| 1653 | + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", | ||
| 1654 | + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", | ||
| 1655 | + "dev": true, | ||
| 1656 | + "requires": { | ||
| 1657 | + "camelcase": "2.1.1", | ||
| 1658 | + "map-obj": "1.0.1" | ||
| 1659 | + }, | ||
| 1660 | + "dependencies": { | ||
| 1661 | + "camelcase": { | ||
| 1662 | + "version": "2.1.1", | ||
| 1663 | + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", | ||
| 1664 | + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", | ||
| 1665 | + "dev": true | ||
| 1666 | + } | ||
| 1667 | + } | ||
| 1668 | + }, | ||
| 1645 | "center-align": { | 1669 | "center-align": { |
| 1646 | "version": "0.1.3", | 1670 | "version": "0.1.3", |
| 1647 | "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", | 1671 | "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", |
| @@ -1888,9 +1912,9 @@ | @@ -1888,9 +1912,9 @@ | ||
| 1888 | } | 1912 | } |
| 1889 | }, | 1913 | }, |
| 1890 | "compression-webpack-plugin": { | 1914 | "compression-webpack-plugin": { |
| 1891 | - "version": "1.0.0", | ||
| 1892 | - "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.0.0.tgz", | ||
| 1893 | - "integrity": "sha512-OPp+tvvMCd8FrJHDLG4v5EpP4Fe5w5uBNXOmc3K7SdBaK1FH+TGwtafG9GLgTI6c2WHIgDFt98T8qXwaXuyRnw==", | 1915 | + "version": "1.0.1", |
| 1916 | + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.0.1.tgz", | ||
| 1917 | + "integrity": "sha512-ABF2AFb31gpIBeEy/w6Ct0u+K+jY8jFRfGwjUWGxVTidA9pf7iH/JzjcVBQ+KB1gNMycujMxA56/PznMPUV5jw==", | ||
| 1894 | "requires": { | 1918 | "requires": { |
| 1895 | "async": "2.4.1", | 1919 | "async": "2.4.1", |
| 1896 | "webpack-sources": "1.0.1" | 1920 | "webpack-sources": "1.0.1" |
| @@ -3564,6 +3588,15 @@ | @@ -3564,6 +3588,15 @@ | ||
| 3564 | "integrity": "sha1-3c5MVHtRCuDVlKjx+/iq+OLFwA0=", | 3588 | "integrity": "sha1-3c5MVHtRCuDVlKjx+/iq+OLFwA0=", |
| 3565 | "dev": true | 3589 | "dev": true |
| 3566 | }, | 3590 | }, |
| 3591 | + "currently-unhandled": { | ||
| 3592 | + "version": "0.4.1", | ||
| 3593 | + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", | ||
| 3594 | + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", | ||
| 3595 | + "dev": true, | ||
| 3596 | + "requires": { | ||
| 3597 | + "array-find-index": "1.0.2" | ||
| 3598 | + } | ||
| 3599 | + }, | ||
| 3567 | "custom-event": { | 3600 | "custom-event": { |
| 3568 | "version": "1.0.1", | 3601 | "version": "1.0.1", |
| 3569 | "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", | 3602 | "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", |
| @@ -3631,19 +3664,9 @@ | @@ -3631,19 +3664,9 @@ | ||
| 3631 | "dev": true | 3664 | "dev": true |
| 3632 | }, | 3665 | }, |
| 3633 | "deepmerge": { | 3666 | "deepmerge": { |
| 3634 | - "version": "1.5.1", | ||
| 3635 | - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.1.tgz", | ||
| 3636 | - "integrity": "sha512-Ndl8eeOHB9dQkmT1HWCgY3t0odl4bmWKFzjQZBYAxVTNs2B3nn5b6orimRYHKZ4FI8psvZkA1INRCW6l7vc9lQ==" | ||
| 3637 | - }, | ||
| 3638 | - "default-gateway": { | ||
| 3639 | - "version": "2.5.0", | ||
| 3640 | - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.5.0.tgz", | ||
| 3641 | - "integrity": "sha512-Mb+xi1aktPE+Uz5RmS3vU6Kr1fDqRvlMX3M5eneBai7LkldzM+WPjaUpz396taZgOgSw4s+CJGvd6VJJ/9W0dQ==", | ||
| 3642 | - "dev": true, | ||
| 3643 | - "requires": { | ||
| 3644 | - "execa": "0.7.0", | ||
| 3645 | - "ip-regex": "2.1.0" | ||
| 3646 | - } | 3667 | + "version": "1.5.2", |
| 3668 | + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", | ||
| 3669 | + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" | ||
| 3647 | }, | 3670 | }, |
| 3648 | "define-properties": { | 3671 | "define-properties": { |
| 3649 | "version": "1.1.2", | 3672 | "version": "1.1.2", |
| @@ -5882,6 +5905,12 @@ | @@ -5882,6 +5905,12 @@ | ||
| 5882 | "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", | 5905 | "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", |
| 5883 | "dev": true | 5906 | "dev": true |
| 5884 | }, | 5907 | }, |
| 5908 | + "get-stdin": { | ||
| 5909 | + "version": "4.0.1", | ||
| 5910 | + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", | ||
| 5911 | + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", | ||
| 5912 | + "dev": true | ||
| 5913 | + }, | ||
| 5885 | "get-stream": { | 5914 | "get-stream": { |
| 5886 | "version": "3.0.0", | 5915 | "version": "3.0.0", |
| 5887 | "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", | 5916 | "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", |
| @@ -9760,6 +9789,15 @@ | @@ -9760,6 +9789,15 @@ | ||
| 9760 | "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", | 9789 | "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", |
| 9761 | "dev": true | 9790 | "dev": true |
| 9762 | }, | 9791 | }, |
| 9792 | + "indent-string": { | ||
| 9793 | + "version": "2.1.0", | ||
| 9794 | + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", | ||
| 9795 | + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", | ||
| 9796 | + "dev": true, | ||
| 9797 | + "requires": { | ||
| 9798 | + "repeating": "2.0.1" | ||
| 9799 | + } | ||
| 9800 | + }, | ||
| 9763 | "indexes-of": { | 9801 | "indexes-of": { |
| 9764 | "version": "1.0.1", | 9802 | "version": "1.0.1", |
| 9765 | "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", | 9803 | "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", |
| @@ -9821,24 +9859,6 @@ | @@ -9821,24 +9859,6 @@ | ||
| 9821 | "through": "2.3.8" | 9859 | "through": "2.3.8" |
| 9822 | } | 9860 | } |
| 9823 | }, | 9861 | }, |
| 9824 | - "internal-ip": { | ||
| 9825 | - "version": "2.0.3", | ||
| 9826 | - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-2.0.3.tgz", | ||
| 9827 | - "integrity": "sha512-XxJMiJOjXbb9LlwH6SVTsnUPymYACunXzKg3dqU+HIC+xYIkUhMyTiT/H6xxPmhlE4zHq50lKlx0CZlyN2C76Q==", | ||
| 9828 | - "dev": true, | ||
| 9829 | - "requires": { | ||
| 9830 | - "default-gateway": "2.5.0", | ||
| 9831 | - "ipaddr.js": "1.5.2" | ||
| 9832 | - }, | ||
| 9833 | - "dependencies": { | ||
| 9834 | - "ipaddr.js": { | ||
| 9835 | - "version": "1.5.2", | ||
| 9836 | - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz", | ||
| 9837 | - "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=", | ||
| 9838 | - "dev": true | ||
| 9839 | - } | ||
| 9840 | - } | ||
| 9841 | - }, | ||
| 9842 | "interpret": { | 9862 | "interpret": { |
| 9843 | "version": "1.0.3", | 9863 | "version": "1.0.3", |
| 9844 | "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", | 9864 | "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", |
| @@ -9866,12 +9886,6 @@ | @@ -9866,12 +9886,6 @@ | ||
| 9866 | "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", | 9886 | "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", |
| 9867 | "dev": true | 9887 | "dev": true |
| 9868 | }, | 9888 | }, |
| 9869 | - "ip-regex": { | ||
| 9870 | - "version": "2.1.0", | ||
| 9871 | - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", | ||
| 9872 | - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", | ||
| 9873 | - "dev": true | ||
| 9874 | - }, | ||
| 9875 | "ipaddr.js": { | 9889 | "ipaddr.js": { |
| 9876 | "version": "1.4.0", | 9890 | "version": "1.4.0", |
| 9877 | "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", | 9891 | "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", |
| @@ -11465,9 +11479,9 @@ | @@ -11465,9 +11479,9 @@ | ||
| 11465 | } | 11479 | } |
| 11466 | }, | 11480 | }, |
| 11467 | "karma-webpack": { | 11481 | "karma-webpack": { |
| 11468 | - "version": "2.0.4", | ||
| 11469 | - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.4.tgz", | ||
| 11470 | - "integrity": "sha1-Pi1PSLqUqHjhxmu44a5hKJh6F1s=", | 11482 | + "version": "2.0.5", |
| 11483 | + "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.5.tgz", | ||
| 11484 | + "integrity": "sha512-tb+P6rCNqPpVOzaDkNvuAX5gXJ/baGIFBSD/Pin1p1RTa3cookXxEc5wRkrLVA9acwEKvEq1TetGkOX1f8mf8A==", | ||
| 11471 | "dev": true, | 11485 | "dev": true, |
| 11472 | "requires": { | 11486 | "requires": { |
| 11473 | "async": "0.9.2", | 11487 | "async": "0.9.2", |
| @@ -12591,6 +12605,16 @@ | @@ -12591,6 +12605,16 @@ | ||
| 12591 | "js-tokens": "3.0.2" | 12605 | "js-tokens": "3.0.2" |
| 12592 | } | 12606 | } |
| 12593 | }, | 12607 | }, |
| 12608 | + "loud-rejection": { | ||
| 12609 | + "version": "1.6.0", | ||
| 12610 | + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", | ||
| 12611 | + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", | ||
| 12612 | + "dev": true, | ||
| 12613 | + "requires": { | ||
| 12614 | + "currently-unhandled": "0.4.1", | ||
| 12615 | + "signal-exit": "3.0.2" | ||
| 12616 | + } | ||
| 12617 | + }, | ||
| 12594 | "lower-case": { | 12618 | "lower-case": { |
| 12595 | "version": "1.1.4", | 12619 | "version": "1.1.4", |
| 12596 | "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", | 12620 | "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", |
| @@ -12616,6 +12640,12 @@ | @@ -12616,6 +12640,12 @@ | ||
| 12616 | "tmpl": "1.0.4" | 12640 | "tmpl": "1.0.4" |
| 12617 | } | 12641 | } |
| 12618 | }, | 12642 | }, |
| 12643 | + "map-obj": { | ||
| 12644 | + "version": "1.0.1", | ||
| 12645 | + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", | ||
| 12646 | + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", | ||
| 12647 | + "dev": true | ||
| 12648 | + }, | ||
| 12619 | "md5.js": { | 12649 | "md5.js": { |
| 12620 | "version": "1.3.4", | 12650 | "version": "1.3.4", |
| 12621 | "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", | 12651 | "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", |
| @@ -12663,6 +12693,86 @@ | @@ -12663,6 +12693,86 @@ | ||
| 12663 | "readable-stream": "2.3.3" | 12693 | "readable-stream": "2.3.3" |
| 12664 | } | 12694 | } |
| 12665 | }, | 12695 | }, |
| 12696 | + "meow": { | ||
| 12697 | + "version": "3.7.0", | ||
| 12698 | + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", | ||
| 12699 | + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", | ||
| 12700 | + "dev": true, | ||
| 12701 | + "requires": { | ||
| 12702 | + "camelcase-keys": "2.1.0", | ||
| 12703 | + "decamelize": "1.2.0", | ||
| 12704 | + "loud-rejection": "1.6.0", | ||
| 12705 | + "map-obj": "1.0.1", | ||
| 12706 | + "minimist": "1.2.0", | ||
| 12707 | + "normalize-package-data": "2.4.0", | ||
| 12708 | + "object-assign": "4.1.1", | ||
| 12709 | + "read-pkg-up": "1.0.1", | ||
| 12710 | + "redent": "1.0.0", | ||
| 12711 | + "trim-newlines": "1.0.0" | ||
| 12712 | + }, | ||
| 12713 | + "dependencies": { | ||
| 12714 | + "load-json-file": { | ||
| 12715 | + "version": "1.1.0", | ||
| 12716 | + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", | ||
| 12717 | + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", | ||
| 12718 | + "dev": true, | ||
| 12719 | + "requires": { | ||
| 12720 | + "graceful-fs": "4.1.11", | ||
| 12721 | + "parse-json": "2.2.0", | ||
| 12722 | + "pify": "2.3.0", | ||
| 12723 | + "pinkie-promise": "2.0.1", | ||
| 12724 | + "strip-bom": "2.0.0" | ||
| 12725 | + } | ||
| 12726 | + }, | ||
| 12727 | + "minimist": { | ||
| 12728 | + "version": "1.2.0", | ||
| 12729 | + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", | ||
| 12730 | + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", | ||
| 12731 | + "dev": true | ||
| 12732 | + }, | ||
| 12733 | + "path-type": { | ||
| 12734 | + "version": "1.1.0", | ||
| 12735 | + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", | ||
| 12736 | + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", | ||
| 12737 | + "dev": true, | ||
| 12738 | + "requires": { | ||
| 12739 | + "graceful-fs": "4.1.11", | ||
| 12740 | + "pify": "2.3.0", | ||
| 12741 | + "pinkie-promise": "2.0.1" | ||
| 12742 | + } | ||
| 12743 | + }, | ||
| 12744 | + "read-pkg": { | ||
| 12745 | + "version": "1.1.0", | ||
| 12746 | + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", | ||
| 12747 | + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", | ||
| 12748 | + "dev": true, | ||
| 12749 | + "requires": { | ||
| 12750 | + "load-json-file": "1.1.0", | ||
| 12751 | + "normalize-package-data": "2.4.0", | ||
| 12752 | + "path-type": "1.1.0" | ||
| 12753 | + } | ||
| 12754 | + }, | ||
| 12755 | + "read-pkg-up": { | ||
| 12756 | + "version": "1.0.1", | ||
| 12757 | + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", | ||
| 12758 | + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", | ||
| 12759 | + "dev": true, | ||
| 12760 | + "requires": { | ||
| 12761 | + "find-up": "1.1.2", | ||
| 12762 | + "read-pkg": "1.1.0" | ||
| 12763 | + } | ||
| 12764 | + }, | ||
| 12765 | + "strip-bom": { | ||
| 12766 | + "version": "2.0.0", | ||
| 12767 | + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", | ||
| 12768 | + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", | ||
| 12769 | + "dev": true, | ||
| 12770 | + "requires": { | ||
| 12771 | + "is-utf8": "0.2.1" | ||
| 12772 | + } | ||
| 12773 | + } | ||
| 12774 | + } | ||
| 12775 | + }, | ||
| 12666 | "merge-descriptors": { | 12776 | "merge-descriptors": { |
| 12667 | "version": "1.0.1", | 12777 | "version": "1.0.1", |
| 12668 | "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", | 12778 | "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", |
| @@ -13810,6 +13920,16 @@ | @@ -13810,6 +13920,16 @@ | ||
| 13810 | "resolve": "1.3.3" | 13920 | "resolve": "1.3.3" |
| 13811 | } | 13921 | } |
| 13812 | }, | 13922 | }, |
| 13923 | + "redent": { | ||
| 13924 | + "version": "1.0.0", | ||
| 13925 | + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", | ||
| 13926 | + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", | ||
| 13927 | + "dev": true, | ||
| 13928 | + "requires": { | ||
| 13929 | + "indent-string": "2.1.0", | ||
| 13930 | + "strip-indent": "1.0.1" | ||
| 13931 | + } | ||
| 13932 | + }, | ||
| 13813 | "regenerate": { | 13933 | "regenerate": { |
| 13814 | "version": "1.3.2", | 13934 | "version": "1.3.2", |
| 13815 | "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", | 13935 | "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", |
| @@ -14264,9 +14384,9 @@ | @@ -14264,9 +14384,9 @@ | ||
| 14264 | } | 14384 | } |
| 14265 | }, | 14385 | }, |
| 14266 | "sinon-chai": { | 14386 | "sinon-chai": { |
| 14267 | - "version": "2.13.0", | ||
| 14268 | - "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.13.0.tgz", | ||
| 14269 | - "integrity": "sha512-hRNu/TlYEp4Rw5IbzO8ykGoZMSG489PGUx1rvePpHGrtl20cXivRBgtr/EWYxIwL9EOO9+on04nd9k3tW8tVww==", | 14387 | + "version": "2.14.0", |
| 14388 | + "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.14.0.tgz", | ||
| 14389 | + "integrity": "sha512-9stIF1utB0ywNHNT7RgiXbdmen8QDCRsrTjw+G9TgKt1Yexjiv8TOWZ6WHsTPz57Yky3DIswZvEqX8fpuHNDtQ==", | ||
| 14270 | "dev": true | 14390 | "dev": true |
| 14271 | }, | 14391 | }, |
| 14272 | "slash": { | 14392 | "slash": { |
| @@ -14615,6 +14735,15 @@ | @@ -14615,6 +14735,15 @@ | ||
| 14615 | "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", | 14735 | "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", |
| 14616 | "dev": true | 14736 | "dev": true |
| 14617 | }, | 14737 | }, |
| 14738 | + "strip-indent": { | ||
| 14739 | + "version": "1.0.1", | ||
| 14740 | + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", | ||
| 14741 | + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", | ||
| 14742 | + "dev": true, | ||
| 14743 | + "requires": { | ||
| 14744 | + "get-stdin": "4.0.1" | ||
| 14745 | + } | ||
| 14746 | + }, | ||
| 14618 | "strip-json-comments": { | 14747 | "strip-json-comments": { |
| 14619 | "version": "2.0.1", | 14748 | "version": "2.0.1", |
| 14620 | "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", | 14749 | "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", |
| @@ -14821,6 +14950,12 @@ | @@ -14821,6 +14950,12 @@ | ||
| 14821 | "integrity": "sha1-8CzYp0vYvi/A6YYRw7rLlaFxhpw=", | 14950 | "integrity": "sha1-8CzYp0vYvi/A6YYRw7rLlaFxhpw=", |
| 14822 | "dev": true | 14951 | "dev": true |
| 14823 | }, | 14952 | }, |
| 14953 | + "trim-newlines": { | ||
| 14954 | + "version": "1.0.0", | ||
| 14955 | + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", | ||
| 14956 | + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", | ||
| 14957 | + "dev": true | ||
| 14958 | + }, | ||
| 14824 | "trim-right": { | 14959 | "trim-right": { |
| 14825 | "version": "1.0.1", | 14960 | "version": "1.0.1", |
| 14826 | "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", | 14961 | "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", |
| @@ -15108,9 +15243,9 @@ | @@ -15108,9 +15243,9 @@ | ||
| 15108 | "dev": true | 15243 | "dev": true |
| 15109 | }, | 15244 | }, |
| 15110 | "vue": { | 15245 | "vue": { |
| 15111 | - "version": "2.4.4", | ||
| 15112 | - "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz", | ||
| 15113 | - "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==", | 15246 | + "version": "2.5.0", |
| 15247 | + "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.0.tgz", | ||
| 15248 | + "integrity": "sha512-KngZQLLe/N2Bvl3qu0xgqQHemm9MNz9y73D7yJ5tVavOKyhSgCLARYzrXJzYtoeadUSrItzV36VrHywLGVUx7w==", | ||
| 15114 | "dev": true | 15249 | "dev": true |
| 15115 | }, | 15250 | }, |
| 15116 | "vue-hot-reload-api": { | 15251 | "vue-hot-reload-api": { |
| @@ -15779,9 +15914,9 @@ | @@ -15779,9 +15914,9 @@ | ||
| 15779 | } | 15914 | } |
| 15780 | }, | 15915 | }, |
| 15781 | "vue-router": { | 15916 | "vue-router": { |
| 15782 | - "version": "2.7.0", | ||
| 15783 | - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.7.0.tgz", | ||
| 15784 | - "integrity": "sha512-kxgsT50dDExua3i103nxNBjlfk8LeUmO9iujVxXV42MnISINHUjqMrknpOOJEg+i9nEkoVgG8N86Pklze35c/A==", | 15917 | + "version": "2.8.0", |
| 15918 | + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.8.0.tgz", | ||
| 15919 | + "integrity": "sha512-p9w/ZgvK5jBmwpcYSVtF2bic1tCKt+HtSx9011c9uH47K+yJg6la/O0MxYVWCFReL/HtbIwbUpOYAgU4wYD12g==", | ||
| 15785 | "dev": true | 15920 | "dev": true |
| 15786 | }, | 15921 | }, |
| 15787 | "vue-style-loader": { | 15922 | "vue-style-loader": { |
| @@ -15834,9 +15969,9 @@ | @@ -15834,9 +15969,9 @@ | ||
| 15834 | } | 15969 | } |
| 15835 | }, | 15970 | }, |
| 15836 | "vue-template-compiler": { | 15971 | "vue-template-compiler": { |
| 15837 | - "version": "2.4.4", | ||
| 15838 | - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", | ||
| 15839 | - "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", | 15972 | + "version": "2.5.0", |
| 15973 | + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.0.tgz", | ||
| 15974 | + "integrity": "sha512-W4hDoXXpCwfilO1MRTDM4EHm1DC1mU1wS8WyvEo119cUtxdaPuq/dD0OJbSEIkeW8fdT07qGCSnLOfPlmrKRqw==", | ||
| 15840 | "dev": true, | 15975 | "dev": true, |
| 15841 | "requires": { | 15976 | "requires": { |
| 15842 | "de-indent": "1.0.2", | 15977 | "de-indent": "1.0.2", |
| @@ -15879,14 +16014,14 @@ | @@ -15879,14 +16014,14 @@ | ||
| 15879 | } | 16014 | } |
| 15880 | }, | 16015 | }, |
| 15881 | "webpack": { | 16016 | "webpack": { |
| 15882 | - "version": "3.6.0", | ||
| 15883 | - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz", | ||
| 15884 | - "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==", | 16017 | + "version": "3.7.1", |
| 16018 | + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.7.1.tgz", | ||
| 16019 | + "integrity": "sha512-8MR+gVfxsvtx4J1UlbRGkUJEpDQUBFmisRmpPO5cVLgF21R8UMChX39OOjDz63a+m/iswGoqATszdZB2VCsYuA==", | ||
| 15885 | "dev": true, | 16020 | "dev": true, |
| 15886 | "requires": { | 16021 | "requires": { |
| 15887 | "acorn": "5.1.1", | 16022 | "acorn": "5.1.1", |
| 15888 | "acorn-dynamic-import": "2.0.2", | 16023 | "acorn-dynamic-import": "2.0.2", |
| 15889 | - "ajv": "5.2.2", | 16024 | + "ajv": "5.2.3", |
| 15890 | "ajv-keywords": "2.1.0", | 16025 | "ajv-keywords": "2.1.0", |
| 15891 | "async": "2.5.0", | 16026 | "async": "2.5.0", |
| 15892 | "enhanced-resolve": "3.4.1", | 16027 | "enhanced-resolve": "3.4.1", |
| @@ -15909,9 +16044,9 @@ | @@ -15909,9 +16044,9 @@ | ||
| 15909 | }, | 16044 | }, |
| 15910 | "dependencies": { | 16045 | "dependencies": { |
| 15911 | "ajv": { | 16046 | "ajv": { |
| 15912 | - "version": "5.2.2", | ||
| 15913 | - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", | ||
| 15914 | - "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", | 16047 | + "version": "5.2.3", |
| 16048 | + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz", | ||
| 16049 | + "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=", | ||
| 15915 | "dev": true, | 16050 | "dev": true, |
| 15916 | "requires": { | 16051 | "requires": { |
| 15917 | "co": "4.6.0", | 16052 | "co": "4.6.0", |
| @@ -16051,9 +16186,9 @@ | @@ -16051,9 +16186,9 @@ | ||
| 16051 | } | 16186 | } |
| 16052 | }, | 16187 | }, |
| 16053 | "webpack-dev-server": { | 16188 | "webpack-dev-server": { |
| 16054 | - "version": "2.8.2", | ||
| 16055 | - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.8.2.tgz", | ||
| 16056 | - "integrity": "sha512-wD9bs+Z1uwvf3Jc+8ZkyMI0Xi+aJJYjC2UZplOWoo/vStelK5Mv62X2uXYEYIQEjy9wJQMzC0fEFqQsg7vVEIg==", | 16189 | + "version": "2.9.1", |
| 16190 | + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.9.1.tgz", | ||
| 16191 | + "integrity": "sha512-qFKs4Wg6JI6FkAQ6WFqeDCCxXEBLsDHkqJB3f9tmlqx8C68Y9vQWwcaMT4Q9H8WF32Q6QUNmgK4qQkdHfXvj/g==", | ||
| 16057 | "dev": true, | 16192 | "dev": true, |
| 16058 | "requires": { | 16193 | "requires": { |
| 16059 | "ansi-html": "0.0.7", | 16194 | "ansi-html": "0.0.7", |
| @@ -16066,7 +16201,7 @@ | @@ -16066,7 +16201,7 @@ | ||
| 16066 | "express": "4.15.4", | 16201 | "express": "4.15.4", |
| 16067 | "html-entities": "1.2.1", | 16202 | "html-entities": "1.2.1", |
| 16068 | "http-proxy-middleware": "0.17.4", | 16203 | "http-proxy-middleware": "0.17.4", |
| 16069 | - "internal-ip": "2.0.3", | 16204 | + "internal-ip": "1.2.0", |
| 16070 | "ip": "1.1.5", | 16205 | "ip": "1.1.5", |
| 16071 | "loglevel": "1.5.0", | 16206 | "loglevel": "1.5.0", |
| 16072 | "opn": "5.1.0", | 16207 | "opn": "5.1.0", |
| @@ -16140,6 +16275,15 @@ | @@ -16140,6 +16275,15 @@ | ||
| 16140 | "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", | 16275 | "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", |
| 16141 | "dev": true | 16276 | "dev": true |
| 16142 | }, | 16277 | }, |
| 16278 | + "internal-ip": { | ||
| 16279 | + "version": "1.2.0", | ||
| 16280 | + "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", | ||
| 16281 | + "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", | ||
| 16282 | + "dev": true, | ||
| 16283 | + "requires": { | ||
| 16284 | + "meow": "3.7.0" | ||
| 16285 | + } | ||
| 16286 | + }, | ||
| 16143 | "load-json-file": { | 16287 | "load-json-file": { |
| 16144 | "version": "1.1.0", | 16288 | "version": "1.1.0", |
| 16145 | "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", | 16289 | "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", |
package.json
| @@ -41,9 +41,9 @@ | @@ -41,9 +41,9 @@ | ||
| 41 | }, | 41 | }, |
| 42 | "dependencies": { | 42 | "dependencies": { |
| 43 | "async-validator": "^1.8.1", | 43 | "async-validator": "^1.8.1", |
| 44 | - "compression-webpack-plugin": "^1.0.0", | 44 | + "compression-webpack-plugin": "^1.0.1", |
| 45 | "core-js": "^2.5.0", | 45 | "core-js": "^2.5.0", |
| 46 | - "deepmerge": "^1.5.1", | 46 | + "deepmerge": "^1.5.2", |
| 47 | "element-resize-detector": "^1.1.12", | 47 | "element-resize-detector": "^1.1.12", |
| 48 | "lodash.throttle": "^4.1.1", | 48 | "lodash.throttle": "^4.1.1", |
| 49 | "popper.js": "^0.6.4", | 49 | "popper.js": "^0.6.4", |
| @@ -83,24 +83,24 @@ | @@ -83,24 +83,24 @@ | ||
| 83 | "karma-sinon-chai": "^1.3.2", | 83 | "karma-sinon-chai": "^1.3.2", |
| 84 | "karma-sourcemap-loader": "^0.3.7", | 84 | "karma-sourcemap-loader": "^0.3.7", |
| 85 | "karma-spec-reporter": "0.0.26", | 85 | "karma-spec-reporter": "0.0.26", |
| 86 | - "karma-webpack": "^2.0.4", | 86 | + "karma-webpack": "^2.0.5", |
| 87 | "less": "^2.7.1", | 87 | "less": "^2.7.1", |
| 88 | "less-loader": "^2.2.3", | 88 | "less-loader": "^2.2.3", |
| 89 | "lolex": "^1.5.2", | 89 | "lolex": "^1.5.2", |
| 90 | "mocha": "^3.5.3", | 90 | "mocha": "^3.5.3", |
| 91 | "sinon": "^3.3.0", | 91 | "sinon": "^3.3.0", |
| 92 | - "sinon-chai": "^2.13.0", | 92 | + "sinon-chai": "^2.14.0", |
| 93 | "style-loader": "^0.13.1", | 93 | "style-loader": "^0.13.1", |
| 94 | "url-loader": "^0.5.9", | 94 | "url-loader": "^0.5.9", |
| 95 | - "vue": "^2.4.4", | 95 | + "vue": "^2.5.0", |
| 96 | "vue-hot-reload-api": "^1.3.3", | 96 | "vue-hot-reload-api": "^1.3.3", |
| 97 | "vue-html-loader": "^1.2.3", | 97 | "vue-html-loader": "^1.2.3", |
| 98 | "vue-loader": "^11.3.4", | 98 | "vue-loader": "^11.3.4", |
| 99 | - "vue-router": "^2.7.0", | 99 | + "vue-router": "^2.8.0", |
| 100 | "vue-style-loader": "^1.0.0", | 100 | "vue-style-loader": "^1.0.0", |
| 101 | - "vue-template-compiler": "^2.4.4", | ||
| 102 | - "webpack": "^3.6.0", | ||
| 103 | - "webpack-dev-server": "^2.8.2", | 101 | + "vue-template-compiler": "^2.5.0", |
| 102 | + "webpack": "^3.7.1", | ||
| 103 | + "webpack-dev-server": "^2.9.1", | ||
| 104 | "webpack-merge": "^3.0.0" | 104 | "webpack-merge": "^3.0.0" |
| 105 | }, | 105 | }, |
| 106 | "engines": { | 106 | "engines": { |
src/components/scroll/loading-component.vue
src/components/scroll/scroll.vue
src/styles/components/scroll.less