bugfix

Author: dexteryy

examples/dist/js/main.js

@@ -6898,6 +6898,9 @@ define("../cardkit/app", [
                     if (e.state.next === '_modal_') {
                         // 11. forward from normal card, show modal card.  alert(11)
                         if (modalCard.isOpened || loading || !ck.viewport) {
+                            modalCard.event.once('close', function(){
+                                pageSession.reset();
+                            });
                             history.back();
                         } else {
                             modalCard.set(e.state.opt).open();
@@ -6944,7 +6947,9 @@ define("../cardkit/app", [
                 restore_state = current_state && current_state.next; // alert(['init', current_state && [current_state.prev, current_state.next], ck.viewport && ck.viewport[0].id].join(', '))
             if (restore_state === '_modal_') { // @TODO
                 restore_state = current_state.prev;
-                modalCard.set(history.state.opt).open();
+                if (!modalCard.isOpened && ck.viewport) {
+                    modalCard.set(history.state.opt).open();
+                }
             }
             if (restore_state) {
                 // 1. reload from normal card.  alert(0)

examples/overlay.html

@@ -322,8 +322,8 @@ <h2>Overlay</h2>
                 var json = net.parseJSON(maybe_json) || { e: 0 };
                 if (!json.e) {
                     //ck.openURL('picker.html');
-                    location.href = 'picker.html';
-                    //location.reload();
+                    //location.href = 'http://www.douban.com/photos/album/46548339/';
+                    location.reload();
                     //modal.ok().then(function(){
                         //location.reload();
                     //});

js/cardkit/app.js

@@ -384,6 +384,9 @@ define([
                     if (e.state.next === '_modal_') {
                         // 11. forward from normal card, show modal card.  alert(11)
                         if (modalCard.isOpened || loading || !ck.viewport) {
+                            modalCard.event.once('close', function(){
+                                pageSession.reset();
+                            });
                             history.back();
                         } else {
                             modalCard.set(e.state.opt).open();
@@ -430,7 +433,9 @@ define([
                 restore_state = current_state && current_state.next; // alert(['init', current_state && [current_state.prev, current_state.next], ck.viewport && ck.viewport[0].id].join(', '))
             if (restore_state === '_modal_') { // @TODO
                 restore_state = current_state.prev;
-                modalCard.set(history.state.opt).open();
+                if (!modalCard.isOpened && ck.viewport) {
+                    modalCard.set(history.state.opt).open();
+                }
             }
             if (restore_state) {
                 // 1. reload from normal card.  alert(0)