From c4a87761e3bbf95454c8b62c3d2fd8a1a9d0a1cc Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 31 Aug 2016 11:04:16 +0800
Subject: [PATCH] fix pagination icon and dialog slot

---
 packages/dialog/src/component.vue |  2 +-
 packages/pagination/src/pager.vue | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dialog/src/component.vue b/packages/dialog/src/component.vue
index daaaa6314..bf7f419d0 100644
--- a/packages/dialog/src/component.vue
+++ b/packages/dialog/src/component.vue
@@ -8,7 +8,7 @@
             <i class="el-dialog__close el-icon el-icon-close" @click='close()'></i>
           </div>
         </div>
-        <div class="el-dialog__body"><slot></slot></div>
+        <div class="el-dialog__body" v-if="rendered"><slot></slot></div>
         <div class="el-dialog__footer" v-if="$slots.footer">
           <slot name="footer"></slot>
         </div>
diff --git a/packages/pagination/src/pager.vue b/packages/pagination/src/pager.vue
index 879da2ea0..e2b6736e6 100644
--- a/packages/pagination/src/pager.vue
+++ b/packages/pagination/src/pager.vue
@@ -5,11 +5,11 @@
       v-if="pageCount > 0"
       class="number">1</li>
     <li
-      class="el-icon ellipsis btn-quickprev"
+      class="el-icon more btn-quickprev"
       :class="[quickprevIconClass]"
       v-if="showPrevMore"
       @mouseenter="quickprevIconClass = 'el-icon-d-arrow-left'"
-      @mouseleave="quickprevIconClass = 'el-icon-ellipsis'"
+      @mouseleave="quickprevIconClass = 'el-icon-more'"
     >
     </li>
     <li
@@ -17,11 +17,11 @@
       :class="{ active: currentPage === pager }"
       class="number">{{ pager }}</li>
     <li
-      class="el-icon ellipsis btn-quicknext"
+      class="el-icon more btn-quicknext"
       :class="[quicknextIconClass]"
       v-if="showNextMore"
       @mouseenter="quicknextIconClass = 'el-icon-d-arrow-right'"
-      @mouseleave="quicknextIconClass = 'el-icon-ellipsis'"
+      @mouseleave="quicknextIconClass = 'el-icon-more'"
     >
     </li>
     <li
@@ -52,7 +52,7 @@
         const pageCount = this.pageCount;
         const currentPage = this.currentPage;
 
-        if (target.className.indexOf('ellipsis') !== -1) {
+        if (target.className.indexOf('more') !== -1) {
           if (target.className.indexOf('quickprev') !== -1) {
             newPage = currentPage - 5;
           } else if (target.className.indexOf('quicknext') !== -1) {
@@ -130,8 +130,8 @@
         current: null,
         showPrevMore: false,
         showNextMore: false,
-        quicknextIconClass: 'el-icon-ellipsis',
-        quickprevIconClass: 'el-icon-ellipsis'
+        quicknextIconClass: 'el-icon-more',
+        quickprevIconClass: 'el-icon-more'
       };
     }
   };