bugfix #30

zhaoda · Oct 13, 2015 · 15db277 · 15db277
1 parent 812ba39
commit 15db277
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/dist/spa-apis.js b/dist/spa-apis.js
@@ -1752,6 +1752,9 @@
 
         }
 
+        // 设置关闭状态为false，已经打开面板
+        $panel.data('closing', false)
+
         panelData.prevPage = $curPage
         panelOptions.afteropen.call($panel, panelData)
         $curPage = $panel
@@ -1798,6 +1801,12 @@
 
     options && options.id && ($panel = $('.spa-panel-' + options.id))
 
+    // 判断面板是否在关闭过程中
+    if($panel.data('closing')) {
+      return
+    }
+    $panel.data('closing', true)
+
     // 关闭面板后打开之前的页面
     if($curPage.hasClass('spa-panel') && $curPage.data('id') === panelId) {
       var $page = panelData.prevPage
@@ -2052,7 +2061,6 @@
         clearTimeout(id)
       }
 })()
-
 ;(function (argument) {
   'use strict'
 

diff --git a/dist/spa-apis.min.js b/dist/spa-apis.min.js
diff --git a/dist/spa.js b/dist/spa.js
@@ -1752,6 +1752,9 @@
 
         }
 
+        // 设置关闭状态为false，已经打开面板
+        $panel.data('closing', false)
+
         panelData.prevPage = $curPage
         panelOptions.afteropen.call($panel, panelData)
         $curPage = $panel
@@ -1798,6 +1801,12 @@
 
     options && options.id && ($panel = $('.spa-panel-' + options.id))
 
+    // 判断面板是否在关闭过程中
+    if($panel.data('closing')) {
+      return
+    }
+    $panel.data('closing', true)
+
     // 关闭面板后打开之前的页面
     if($curPage.hasClass('spa-panel') && $curPage.data('id') === panelId) {
       var $page = panelData.prevPage
@@ -2051,4 +2060,4 @@
       window.cancelAnimationFrame = function(id) {
         clearTimeout(id)
       }
-})()
+})()
diff --git a/dist/spa.min.js b/dist/spa.min.js
diff --git a/src/spa.js b/src/spa.js
@@ -1745,6 +1745,9 @@
 
         }
 
+        // 设置关闭状态为false，已经打开面板
+        $panel.data('closing', false)
+
         panelData.prevPage = $curPage
         panelOptions.afteropen.call($panel, panelData)
         $curPage = $panel
@@ -1791,6 +1794,12 @@
 
     options && options.id && ($panel = $('.spa-panel-' + options.id))
 
+    // 判断面板是否在关闭过程中
+    if($panel.data('closing')) {
+      return
+    }
+    $panel.data('closing', true)
+
     // 关闭面板后打开之前的页面
     if($curPage.hasClass('spa-panel') && $curPage.data('id') === panelId) {
       var $page = panelData.prevPage
@@ -2044,4 +2053,4 @@
       window.cancelAnimationFrame = function(id) {
         clearTimeout(id)
       }
-})()
+})()