github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

change mask icon source to github (#4063)

pull/4039/merge
杨奕 2017-04-07 18:57:06 +08:00 committed by Cyril Su
parent d184e9c0b6
commit 44bc660b8b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/index.tpl
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<link rel="stylesheet" href="//at.alicdn.com/t/font_1473762766_7074292.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_1473762766_7074292.css">
<link rel='mask-icon' href="//fuss10.elemecdn.com/9/92/3a6e19a64a8ed173a4677ec0e412bsvg.svg" color="#20a0ff"> <link rel='mask-icon' href="https://raw.githubusercontent.com/ElemeFE/element/dev/examples/assets/images/element-logo-small.svg" color="#20a0ff">
<title>Element</title> <title>Element</title>
</head> </head>
<body> <body>

9
packages/dialog/src/component.vue
View File

@ -25,7 +25,6 @@
<script> <script>
import Popup from 'element-ui/src/utils/popup'; import Popup from 'element-ui/src/utils/popup';
import throttle from 'throttle-debounce/throttle';
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
export default { export default {
@ -98,12 +97,12 @@
this.$emit('input', val); this.$emit('input', val);
if (val) { if (val) {
this.$emit('open'); this.$emit('open');
this.$el.addEventListener('scroll', this.throttledUpdatePopper); this.$el.addEventListener('scroll', this.updatePopper);
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.dialog.scrollTop = 0; this.$refs.dialog.scrollTop = 0;
}); });
} else { } else {
this.$el.removeEventListener('scroll', this.throttledUpdatePopper); this.$el.removeEventListener('scroll', this.updatePopper);
this.$emit('close'); this.$emit('close');
} }
} }
@ -130,10 +129,6 @@
} }
}, },
created() {
this.throttledUpdatePopper = throttle(100, this.updatePopper);
},
mounted() { mounted() {
if (this.value) { if (this.value) {
this.rendered = true; this.rendered = true;