Skip to content

Commit 1739bbd

Browse files
apply new version of vue-popup
1 parent 42a33a8 commit 1739bbd

File tree

4 files changed

+71
-19
lines changed

4 files changed

+71
-19
lines changed

example/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="UTF-8">
55
<meta name="MobileOptimized" content="320">
66
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, minimal-ui, maximum-scale=1.0, minimum-scale=1.0">
7-
<link rel="stylesheet" href="../lib/vue-msgbox.css" charset="utf-8">
87
<style media="screen">
98
button {
109
padding: 1em;

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
],
2727
"author": "long.zhang@ele.me",
2828
"license": "MIT",
29-
"peerDependencies": {
30-
"vue": "^1.0.10",
31-
"vue-popup": "^0.0.x"
32-
},
3329
"devDependencies": {
3430
"babel-cli": "^6.3.15",
3531
"babel-core": "^6.3.15",
@@ -50,6 +46,6 @@
5046
"webpack-dev-server": "^1.14.0"
5147
},
5248
"dependencies": {
53-
"vue-popup": "0.0.7"
49+
"vue-popup": "0.1.4"
5450
}
5551
}

src/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ var showNextMsg = function() {
9696
instance[prop] = options[prop];
9797
}
9898
}
99+
instance.$appendTo(document.body);
99100

100101
Vue.nextTick(() => {
101102
instance.open();

src/msgbox.vue

Lines changed: 69 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
2-
<div class="msgbox" v-show="visible" transition="pop-bounce">
2+
<div class="msgbox" v-if="rendered" v-show="visible" transition="pop-bounce">
33
<div class="msgbox-header" v-if="title !== ''">
44
<div class="msgbox-title">{{ title }}</div>
55
<!--<div class="msgbox-close d-icon icon-close" @click="handleAction('close')"></div>-->
66
</div>
77
<div class="msgbox-content" v-if="message !== ''">
88
<div class="msgbox-status d-icon {{ type ? 'icon-' + type : '' }}"></div>
9-
<div class="msgbox-message">{{ message }}</div>
9+
<div class="msgbox-message"><p>{{ message }}</p></div>
1010
<div class="msgbox-input" v-show="showInput">
1111
<input type="text" v-model="inputValue" :placeholder="inputPlaceholder" />
1212
<div class="msgbox-errormsg" :style="{ visibility: !!editorErrorMessage ? 'visible' : 'hidden' }">{{editorErrorMessage}}</div>
@@ -27,6 +27,10 @@
2727
border-radius: 3px;
2828
font-size: 16px;
2929
-webkit-user-select: none;
30+
left: 50%;
31+
top: 50%;
32+
-webkit-transform: translate(-50%, -50%);
33+
transform: translate(-50%, -50%);
3034
}
3135
3236
.msgbox-header{
@@ -148,6 +152,60 @@
148152
.msgbox-btns-reverse .msgbox-cancel {
149153
border-right: 0;
150154
}
155+
156+
.pop-bounce-enter {
157+
-webkit-animation: pop-bounce-in .3s cubic-bezier(0.3, 0, 0, 1.5);
158+
animation: pop-bounce-in .3s cubic-bezier(0.3, 0, 0, 1.5);
159+
}
160+
161+
.pop-bounce-leave {
162+
-webkit-animation: pop-bounce-out .2s cubic-bezier(0.895, 0.03, 0.685, 0.22);
163+
animation: pop-bounce-out .2s cubic-bezier(0.895, 0.03, 0.685, 0.22);
164+
}
165+
166+
@-webkit-keyframes pop-bounce-in {
167+
0% {
168+
-webkit-transform: translate(-50%, -50%) scale(0.8);
169+
transform: translate(-50%, -50%) scale(0.8);
170+
}
171+
100% {
172+
-webkit-transform: translate(-50%, -50%) scale(1);
173+
transform: translate(-50%, -50%) scale(1);
174+
}
175+
}
176+
177+
@keyframes pop-bounce-in {
178+
0% {
179+
-webkit-transform: translate(-50%, -50%) scale(0.8);
180+
transform: translate(-50%, -50%) scale(0.8);
181+
}
182+
100% {
183+
-webkit-transform: translate(-50%, -50%) scale(1);
184+
transform: translate(-50%, -50%) scale(1);
185+
}
186+
}
187+
188+
@-webkit-keyframes pop-bounce-out {
189+
0% {
190+
-webkit-transform: translate(-50%, -50%) scale(1);
191+
transform: translate(-50%, -50%) scale(1);
192+
}
193+
100% {
194+
-webkit-transform: translate(-50%, -50%) scale(0.7);
195+
transform: translate(-50%, -50%) scale(0.7);
196+
}
197+
}
198+
199+
@keyframes pop-bounce-out {
200+
0% {
201+
-webkit-transform: translate(-50%, -50%) scale(1);
202+
transform: translate(-50%, -50%) scale(1);
203+
}
204+
100% {
205+
-webkit-transform: translate(-50%, -50%) scale(0.7);
206+
transform: translate(-50%, -50%) scale(0.7);
207+
}
208+
}
151209
</style>
152210
<style src="vue-popup/lib/popup.css"></style>
153211

@@ -160,18 +218,16 @@
160218
export default {
161219
mixins: [ Popup ],
162220
163-
computed: {
164-
popupOptions() {
165-
return {
166-
target: 'center',
167-
modal: true,
168-
updatePositionOnResize: true,
169-
openAnimation: 'pop',
170-
closeDelay: 1,
171-
closeOnPressEscape: true
172-
// ,closeOnClickModal: true
173-
};
221+
props: {
222+
modal: {
223+
default: true
174224
},
225+
closeOnPressEscape: {
226+
default: true
227+
}
228+
},
229+
230+
computed: {
175231
confirmButtonClasses() {
176232
var classes = 'msgbox-btn msgbox-confirm ' + this.confirmButtonClass;
177233
if (this.confirmButtonHighlight) {

0 commit comments

Comments
 (0)