drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' of https://github.com/huanghong1125/iview into 2.0

Browse source
This commit is contained in:
huanghong 2018-03-15 10:51:50 +08:00
commit a237e5bd7e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/base/popper.js
View file

@ -3,8 +3,7 @@
* */ * */
import Vue from 'vue'; import Vue from 'vue';
const isServer = Vue.prototype.$isServer; const isServer = Vue.prototype.$isServer;
// const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line const Popper = isServer ? function() {} : require('popper.js/dist/umd/popper.js'); // eslint-disable-line
import Popper from 'popper.js';
export default { export default {
props: { props: {

3
src/components/select/dropdown.vue
View file

@ -5,8 +5,7 @@
import Vue from 'vue'; import Vue from 'vue';
const isServer = Vue.prototype.$isServer; const isServer = Vue.prototype.$isServer;
import { getStyle } from '../../utils/assist'; import { getStyle } from '../../utils/assist';
// const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line const Popper = isServer ? function() {} : require('popper.js/dist/umd/popper.js'); // eslint-disable-line
import Popper from 'popper.js';
export default { export default {
name: 'Drop', name: 'Drop',