bugfix:modal开启时跳转

Author: dexteryy

examples/dist/js/main.js

@@ -6897,7 +6897,7 @@ define("../cardkit/app", [
                 if (e.state) {
                     if (e.state.next === '_modal_') {
                         // 11. forward from normal card, show modal card.  alert(11)
-                        if (loading) {
+                        if (modalCard.isOpened || loading || !ck.viewport) {
                             history.back();
                         } else {
                             modalCard.set(e.state.opt).open();

examples/overlay.html

@@ -321,9 +321,12 @@ <h2>Overlay</h2>
                 modal.hideLoading();
                 var json = net.parseJSON(maybe_json) || { e: 0 };
                 if (!json.e) {
-//                    modal.ok().then(function(){
-                        ck.openURL('picker.html');
-//                    });
+                    //ck.openURL('picker.html');
+                    location.href = 'picker.html';
+                    //location.reload();
+                    //modal.ok().then(function(){
+                        //location.reload();
+                    //});
                 } else {
                     ck.growl({
                         expires: 3000,

js/cardkit/app.js

@@ -383,7 +383,7 @@ define([
                 if (e.state) {
                     if (e.state.next === '_modal_') {
                         // 11. forward from normal card, show modal card.  alert(11)
-                        if (loading) {
+                        if (modalCard.isOpened || loading || !ck.viewport) {
                             history.back();
                         } else {
                             modalCard.set(e.state.opt).open();