Skip to content

Commit

Permalink
Merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
moyus committed Apr 20, 2018
2 parents 9f10415 + 3e24188 commit 53f1188
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/drop-menu/index.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div class="md-drop-menu">
<div class="md-drop-menu-bar">
<template v-for="(item, index) in data">
<template v-for="(item, index) in data">
<div
class="bar-item"
:class="{
Expand All @@ -12,7 +12,7 @@
:key="index"
@click="$_onBarItemClick(item, index)"
>
<span
<span
v-text="$_getBarItemText(item, index)"
></span>
</div>
Expand Down Expand Up @@ -136,7 +136,7 @@ export default {
},
$_setScroller() {
const boxer = this.$el ? this.$el.querySelector('.md-popup-box') : null
if (boxer && boxer.clientHeight >= document.documentElement.clientHeight) {
if (boxer && boxer.clientHeight >= this.$el.clientHeight) {
this.scroller = '.md-field-content'
} else {
return ''
Expand Down

0 comments on commit 53f1188

Please sign in to comment.