From 5d0b89ced828df801b3206dac3367ca048772116 Mon Sep 17 00:00:00 2001
From: Rijn <bxbian951122@gmail.com>
Date: Sun, 5 Feb 2017 22:58:34 -0600
Subject: [PATCH] change scrolling to scrollable
---
src/components/modal/modal.vue | 6 +++---
test/routers/more.vue | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index baf0f53..82265d2 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -77,7 +77,7 @@
type: Boolean,
default: false
},
- scrolling: {
+ scrollable: {
type: Boolean,
default: false
}
@@ -208,7 +208,7 @@
} else {
if (this.timer) clearTimeout(this.timer);
this.wrapShow = true;
- if (!this.scrolling) {
+ if (!this.scrollable) {
this.addScrollEffect();
}
}
@@ -218,7 +218,7 @@
this.buttonLoading = false;
}
},
- scrolling (val) {
+ scrollable (val) {
if (!val) {
this.addScrollEffect();
} else {
diff --git a/test/routers/more.vue b/test/routers/more.vue
index db17c44..9a702f2 100644
--- a/test/routers/more.vue
+++ b/test/routers/more.vue
@@ -5,18 +5,18 @@
</style>
<template>
<i-button type="primary" @click="modal1 = true">显示对话框</i-button>
- <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
- Scrolling:{{scrolling}}
+ <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
+ scrollable:{{scrollable}}
<Modal
:visible.sync="modal1"
title="普通的Modal对话框标题"
- :scrolling="scrolling"
+ :scrollable="scrollable"
@on-ok="ok"
@on-cancel="cancel">
<p>对话框内容</p>
<p>对话框内容</p>
<p>对话框内容</p>
- <i-button @click="scrolling = !scrolling">Toggle Scrolling</i-button>
+ <i-button @click="scrollable = !scrollable">Toggle scrollable</i-button>
</Modal>
</template>
<script>
@@ -24,7 +24,7 @@
data () {
return {
modal1: false,
- scrolling: false
+ scrollable: false
}
},
methods: {
--
libgit2 0.21.4