chenhaodong / mew-iview

Commit a237e5bd7efc938edc0a57ec33a8f779e68e44a4

Authored by huanghong
2 parents 605bd2ae 11d38676

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

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/components/base/popper.js
  Show/Hide comments   View file @a237e5b
@@ -3,8 +3,7 @@ @@ -3,8 +3,7 @@
3 * */ 3 * */
4 import Vue from 'vue'; 4 import Vue from 'vue';
5 const isServer = Vue.prototype.$isServer; 5 const isServer = Vue.prototype.$isServer;
6 -// const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line  
7 -import Popper from 'popper.js'; 6 +const Popper = isServer ? function() {} : require('popper.js/dist/umd/popper.js'); // eslint-disable-line
8 7
9 export default { 8 export default {
10 props: { 9 props: {
src/components/select/dropdown.vue
  Show/Hide comments   View file @a237e5b
@@ -5,8 +5,7 @@ @@ -5,8 +5,7 @@
5 import Vue from 'vue'; 5 import Vue from 'vue';
6 const isServer = Vue.prototype.$isServer; 6 const isServer = Vue.prototype.$isServer;
7 import { getStyle } from '../../utils/assist'; 7 import { getStyle } from '../../utils/assist';
8 - // const Popper = isServer ? function() {} : require('popper.js'); // eslint-disable-line  
9 - import Popper from 'popper.js'; 8 + const Popper = isServer ? function() {} : require('popper.js/dist/umd/popper.js'); // eslint-disable-line
10 9
11 export default { 10 export default {
12 name: 'Drop', 11 name: 'Drop',