popup: Fix wrong setting of overflow-scrolling when using multi popup…

… on Safari. Close #1015
airyland · Mar 2, 2017 · f70f0ae · f70f0ae
1 parent 324781d
commit f70f0ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/popup/index.vue b/src/components/popup/index.vue
@@ -73,7 +73,9 @@ export default {
         }
       } else {
         this.$emit('on-hide')
-        this.fixSafariOverflowScrolling('touch')
+        if (!document.querySelector('.vux-popup-dialog.vux-popup-show')) {
+          this.fixSafariOverflowScrolling('touch')
+        }
         this.show = false
         this.popup.hide(false)
       }

diff --git a/src/components/popup/metas.yml b/src/components/popup/metas.yml
@@ -24,6 +24,11 @@ events:
   on-first-show:
     zh-CN: 第一次显示时触发
 changes:
+  v2.1.1-rc.6:
+    en:
+      - '[fix] Fix wrong setting of overflow-scrolling when using multi popup on Safari #1015 @think2011'
+    zh-CN:
+      - '[fix] 修复 Safari 上关闭第二个popup导致的问题 #1015 @think2011'
   v2.1.1-rc.1:
     en:
       - '[fix] Fix overflow-scrolling setting in safari #311 @linhaobin'