Merge pull request #79 from zhoumengkang/master

与上次类似的登录窗口打开的 js 兼容性调整

Author: xinliangnote

assets/templates/admin/admin_modify_password.html

@@ -132,8 +132,11 @@
                             okay: {
                                 text: '关闭',
                                 action: function () {
-                                    parent.window.close();
-                                    window.open("/login");
+                                    if (window.frames.length !== parent.frames.length) {
+                                        parent.window.open("/login",'_self');
+                                    }else{
+                                        window.open("/login",'_self');
+                                    }
                                 }
                             }
                         }

assets/templates/index/index.html

@@ -281,8 +281,11 @@
                     $.cookie('_nav_title_', '');
                     $.cookie('_login_token_', '');
 
-                    parent.window.close();
-                    window.open("/login");
+                    if (window.frames.length !== parent.frames.length) {
+                        parent.window.open("/login",'_self');
+                    }else{
+                        window.open("/login",'_self');
+                    }
                 },
                 function (response) {
                     AjaxError(response);