From 704d8e1e1f660a1fa13ac010433d5514ca85f74b Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 18 Dec 2014 22:24:03 +0800
Subject: [PATCH]  * fix error of modal trigger on load ajax content.

---
 src/js/modal.trigger.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/js/modal.trigger.js b/src/js/modal.trigger.js
index f813efd77..6da7aa3c3 100644
--- a/src/js/modal.trigger.js
+++ b/src/js/modal.trigger.js
@@ -274,18 +274,25 @@
             {
                 $.get(options.url, function(data)
                 {
-                    var $data = $(data);
-                    if ($data.hasClass('modal-dialog'))
-                    {
-                        $dialog.replaceWith($data);
-                    }
-                    else if ($data.hasClass('modal-content'))
+                    try
                     {
-                        $dialog.find('.modal-content').replaceWith($data);
+                        var $data = $(data);
+                        if ($data.hasClass('modal-dialog'))
+                        {
+                            $dialog.replaceWith($data);
+                        }
+                        else if ($data.hasClass('modal-content'))
+                        {
+                            $dialog.find('.modal-content').replaceWith($data);
+                        }
+                        else
+                        {
+                            $body.wrapInner($data);
+                        }
                     }
-                    else
+                    catch(e)
                     {
-                        $body.wrapInner($data);
+                        $modal.html(data);
                     }
                     $modal.callEvent('loaded.zui.modal',
                     {
-- 
GitLab