From ba0d7165e9653f6543f38e8e00433c6953eac87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8A=E8=BE=B9?= <zangtao.zt@alibaba-inc.com>
Date: Tue, 24 Nov 2015 13:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AAModal=E7=B1=BB=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=88=E5=8C=85=E6=8B=ACtoast=EF=BC=89=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E8=A2=AB=E5=91=BC=E8=B5=B7=E6=97=B6=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E6=8C=89=E5=85=88=E5=90=8E=E9=A1=BA=E5=BA=8F=E8=A2=AB=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=98=9F=E5=88=97=E4=B8=AD=EF=BC=8C=E5=89=8D?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAmodal=E5=85=B3=E9=97=AD=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E4=B8=AAmodal=E6=89=8D=E4=BC=9A=E6=89=93?=
 =?UTF-8?q?=E5=BC=80.=20fix=20#106?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/_includes/_components/modal.html |  3 ++-
 js/modal.js                           | 35 +++++++++++++++------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/docs/_includes/_components/modal.html b/docs/_includes/_components/modal.html
index b3de6a88..b21fa682 100644
--- a/docs/_includes/_components/modal.html
+++ b/docs/_includes/_components/modal.html
@@ -1,6 +1,7 @@
 <article class="component" id="modal">
   <h2 class="component-title">Modal</h2>
-  <p class="component-description">Modal 是从App的主要内容区域上弹出的一小块内容块. Modals经常被用来向用户询问信息，或通知或警告用户。 Modal和其他所有的遮罩图层一样，是所谓的“临时视图”的一部分。</p>
+  <p class="component-description">Modal 是从App的主要内容区域上弹出的一小块内容块,是“临时视图”的一部分。</p>
+  <p class="component-description">多个Modal类组件（包括toast）同时被呼起时，会按先后顺序被缓存在队列中，前一个modal关闭后，下一个modal才会打开</p>
   <p class="component-description">Modals 可以只用JavaScript打开。所以让我们来看看使用modals的相关APP方法</p>
 
   <h3 class="component-title">预定义的 Modals</h3>
diff --git a/js/modal.js b/js/modal.js
index 8e68ec43..fee543d0 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -270,17 +270,18 @@
     //显示一个消息，会在2秒钟后自动消失
     $.toast = function(msg, duration, extraclass) {
       var $toast = $('<div class="modal toast ' + (extraclass || '') + '">' + msg + '</div>').appendTo(document.body);
-      $.openModal($toast);
-      setTimeout(function() {
-        $.closeModal($toast);
-      }, duration || 2000);
+      $.openModal($toast, function(){
+        setTimeout(function() {
+          $.closeModal($toast);
+        }, duration || 2000);     
+      });
     };
-    $.openModal = function (modal) {
+    $.openModal = function (modal, cb) {
         modal = $(modal);
         var isModal = modal.hasClass('modal');
         if ($('.modal.modal-in:not(.modal-out)').length && defaults.modalStack && isModal) {
             $.modalStack.push(function () {
-                $.openModal(modal);
+                $.openModal(modal, cb);
             });
             return;
         }
@@ -328,6 +329,10 @@
             if (modal.hasClass('modal-out')) modal.trigger('closed');
             else modal.trigger('opened');
         });
+        // excute callback
+        if (typeof cb == 'function') {
+          cb.call(this)
+        }
         return true;
     };
     $.closeModal = function (modal) {
@@ -335,20 +340,19 @@
         if (typeof modal !== 'undefined' && modal.length === 0) {
             return;
         }
-        var isModal = modal.hasClass('modal');
-        var isPopup = modal.hasClass('popup');
-        var isLoginScreen = modal.hasClass('login-screen');
-        var isPickerModal = modal.hasClass('picker-modal');
-
-        var removeOnClose = modal.hasClass('remove-on-close');
-
-        var overlay = isPopup ? $('.popup-overlay') : $('.modal-overlay');
+        var isModal = modal.hasClass('modal'),
+            isPopup = modal.hasClass('popup'),
+            isToast = modal.hasClass('toast'),
+            isLoginScreen = modal.hasClass('login-screen'),
+            isPickerModal = modal.hasClass('picker-modal'),
+            removeOnClose = modal.hasClass('remove-on-close'),
+            overlay = isPopup ? $('.popup-overlay') : $('.modal-overlay');
         if (isPopup){
             if (modal.length === $('.popup.modal-in').length) {
                 overlay.removeClass('modal-overlay-visible');
             }
         }
-        else if (!isPickerModal) {
+        else if (!(isPickerModal || isToast)) {
             overlay.removeClass('modal-overlay-visible');
         }
 
@@ -428,6 +432,7 @@
     }
     $(document).on('click', ' .modal-overlay, .popup-overlay, .close-popup, .open-popup, .close-picker', handleClicks);
     var defaults =  $.modal.prototype.defaults  = {
+        modalStack: true,
         modalButtonOk: '确定',
         modalButtonCancel: '取消',
         modalPreloaderTitle: '加载中',